Python 3.6.1 is the first maintenance release of Python 3.6. The Python 3.6 series contains many new features and optimizations. See the What’s New In Python 3.6 document for more information.

Major new features of the 3.6 series, compared to 3.5
Among the new major new features in Python 3.6 are:

PEP 468, Preserving Keyword Argument Order
PEP 487, Simpler customization of class creation
PEP 495, Local Time Disambiguation
PEP 498, Literal String Formatting
PEP 506, Adding A Secrets Module To The Standard Library
PEP 509, Add a private version to dict
PEP 515, Underscores in Numeric Literals
PEP 519, Adding a file system path protocol
PEP 520, Preserving Class Attribute Definition Order
PEP 523, Adding a frame evaluation API to CPython
PEP 524, Make os.urandom() blocking on Linux (during system startup)
PEP 525, Asynchronous Generators (provisional)
PEP 526, Syntax for Variable Annotations (provisional)
PEP 528, Change Windows console encoding to UTF-8
PEP 529, Change Windows filesystem encoding to UTF-8
PEP 530, Asynchronous Comprehensions

6 files changed, 40 insertions, 36 deletions

diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index f5585c79925..d3e0894cd67 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/02/01 11:47:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2017/03/30 11:42:58 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python36-${PY_DISTVERSION}
-PKGREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python36/PLIST b/lang/python36/PLIST
index 93c401ae9b7..ffa90e3ec31 100644
--- a/lang/python36/PLIST
+++ b/lang/python36/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/01/26 09:13:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/03/30 11:42:58 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -2363,7 +2363,6 @@ lib/python${PY_VER_SUFFIX}/shutil.pyo
 lib/python${PY_VER_SUFFIX}/signal.py
 lib/python${PY_VER_SUFFIX}/signal.pyc
 lib/python${PY_VER_SUFFIX}/signal.pyo
-lib/python${PY_VER_SUFFIX}/site-packages/README
 lib/python${PY_VER_SUFFIX}/site-packages/README.txt
 lib/python${PY_VER_SUFFIX}/site.py
 lib/python${PY_VER_SUFFIX}/site.pyc
@@ -2867,9 +2866,15 @@ lib/python${PY_VER_SUFFIX}/test/mime.types
 lib/python${PY_VER_SUFFIX}/test/mock_socket.py
 lib/python${PY_VER_SUFFIX}/test/mock_socket.pyc
 lib/python${PY_VER_SUFFIX}/test/mock_socket.pyo
+lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.py
+lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.pyc
+lib/python${PY_VER_SUFFIX}/test/mod_generics_cache.pyo
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyc
 lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyo
+lib/python${PY_VER_SUFFIX}/test/mp_preload.py
+lib/python${PY_VER_SUFFIX}/test/mp_preload.pyc
+lib/python${PY_VER_SUFFIX}/test/mp_preload.pyo
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.py
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyc
 lib/python${PY_VER_SUFFIX}/test/multibytecodec_support.pyo
@@ -5027,7 +5032,7 @@ lib/python${PY_VER_SUFFIX}/venv/__init__.pyo
 lib/python${PY_VER_SUFFIX}/venv/__main__.py
 lib/python${PY_VER_SUFFIX}/venv/__main__.pyc
 lib/python${PY_VER_SUFFIX}/venv/__main__.pyo
-lib/python${PY_VER_SUFFIX}/venv/scripts/posix/activate
+lib/python${PY_VER_SUFFIX}/venv/scripts/common/activate
 lib/python${PY_VER_SUFFIX}/venv/scripts/posix/activate.csh
 lib/python${PY_VER_SUFFIX}/venv/scripts/posix/activate.fish
 lib/python${PY_VER_SUFFIX}/warnings.py
diff --git a/lang/python36/dist.mk b/lang/python36/dist.mk
index cda4fc7417c..32cd36806ee 100644
--- a/lang/python36/dist.mk
+++ b/lang/python36/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2017/01/01 14:34:27 adam Exp $
+# $NetBSD: dist.mk,v 1.2 2017/03/30 11:42:58 adam Exp $
 
-PY_DISTVERSION=	3.6.0
+PY_DISTVERSION=	3.6.1
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python36/distinfo
diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index 23951739491..455a188adf8 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2017/01/26 09:45:23 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2017/03/30 11:42:58 adam Exp $
 
-SHA1 (Python-3.6.0.tar.xz) = 18ebf7d726782967d967dc00e3aa08b334fbdd5c
-RMD160 (Python-3.6.0.tar.xz) = 984a38d1eec379ac8921479a86259ca0161734af
-SHA512 (Python-3.6.0.tar.xz) = 9d06bee9172bc0bfd2d280fd1c27ea712f3258cfbfd2e2aeb734d0a6710998d5deeefc5d6e72251750dd9493d35461511ceaa187a29dea700ca238ff6ac1dbb2
-Size (Python-3.6.0.tar.xz) = 16805836 bytes
+SHA1 (Python-3.6.1.tar.xz) = 91d880a2a9fcfc6753cbfa132bf47a47e17e7b16
+RMD160 (Python-3.6.1.tar.xz) = 77e70ec6a07b9c17a99ac1df503f12f3a4c49fce
+SHA512 (Python-3.6.1.tar.xz) = 8605fb7019386fec227d4b06d06f00ae500a8a89df289bfe6141bb56196c75483a60cc0ee553930742b31cefce68add5ccf226e0f27b7b915f5026d597e1ac29
+Size (Python-3.6.1.tar.xz) = 16872064 bytes
 SHA1 (patch-Include_py__curses.h) = 14359f8d0527eff08073c0aea60dfe8961d9255d
 SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
 SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
@@ -14,5 +14,5 @@ SHA1 (patch-Modules___cursesmodule.c) = 2ab2779e0418a4529987641c254686ba05d28593
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
-SHA1 (patch-configure) = b3b73638ddd72517f4e80193212a38e0cd991157
-SHA1 (patch-setup.py) = 2ac8834ecc4e8bb27e1721e572e06dbfa74fe277
+SHA1 (patch-configure) = b0ed2f58d1b554aa8d81ffdabaae39f3109811d0
+SHA1 (patch-setup.py) = 1e14b84fc5cb21b3fa61755bf574021ba9b2ab81
diff --git a/lang/python36/patches/patch-configure b/lang/python36/patches/patch-configure
index 549e578a38c..aceae91f7cf 100644
--- a/lang/python36/patches/patch-configure
+++ b/lang/python36/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2017/01/26 09:13:27 adam Exp $
+$NetBSD: patch-configure,v 1.5 2017/03/30 11:42:58 adam Exp $
 
 Simplify _sysconfigdata to include only platform name.
 
@@ -9,7 +9,7 @@ Changes for consistency across pkgsrc platforms.
 
 Fix linking on Darwin.
 
---- configure.orig	2016-12-23 02:21:22.000000000 +0000
+--- configure.orig	2017-03-21 06:32:38.000000000 +0000
 +++ configure
 @@ -2928,7 +2928,7 @@ $as_echo_n "checking for python interpre
  	fi
@@ -20,7 +20,7 @@ Fix linking on Darwin.
      fi
      # Used to comment out stuff for rebuilding generated files
      GENERATED_COMMENT='#'
-@@ -3321,7 +3321,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3324,7 +3324,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
    # OpenBSD 4.6, but is fixed in 4.7.
@@ -29,7 +29,7 @@ Fix linking on Darwin.
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -5977,7 +5977,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5969,7 +5969,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
@@ -38,7 +38,7 @@ Fix linking on Darwin.
  	  LDLIBRARY='libpython$(LDVERSION).so'
  	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-@@ -9196,8 +9196,8 @@ then
+@@ -9188,8 +9188,8 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -49,7 +49,7 @@ Fix linking on Darwin.
  			LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
  	Darwin/*)
-@@ -9221,9 +9221,9 @@ then
+@@ -9213,9 +9213,9 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -62,7 +62,7 @@ Fix linking on Darwin.
  			fi
  		else
  			# building for OS X 10.3 and later
-@@ -9262,6 +9262,9 @@ then
+@@ -9254,6 +9254,9 @@ then
  				   ;;
  				esac
  		fi;;
@@ -72,8 +72,8 @@ Fix linking on Darwin.
  	NetBSD*|DragonFly*)
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
-@@ -9305,7 +9308,7 @@ then
- 		 fi;;
+@@ -9298,7 +9301,7 @@ then
+ 	Linux-android*) ;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
 -	FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
@@ -81,7 +81,7 @@ Fix linking on Darwin.
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -9354,7 +9357,7 @@ then
+@@ -9348,7 +9351,7 @@ then
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -90,7 +90,7 @@ Fix linking on Darwin.
  		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
-@@ -14882,8 +14885,6 @@ $as_echo "$SOABI" >&6; }
+@@ -14949,8 +14952,6 @@ $as_echo "$SOABI" >&6; }
  
  
  case $ac_sys_system in
@@ -99,7 +99,7 @@ Fix linking on Darwin.
      *)
  	EXT_SUFFIX=${SHLIB_SUFFIX};;
  esac
-@@ -14895,11 +14896,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
+@@ -14962,11 +14963,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  $as_echo "$LDVERSION" >&6; }
  
  
diff --git a/lang/python36/patches/patch-setup.py b/lang/python36/patches/patch-setup.py
index 146d1c7d26e..29207351396 100644
--- a/lang/python36/patches/patch-setup.py
+++ b/lang/python36/patches/patch-setup.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-setup.py,v 1.2 2017/01/26 09:45:23 jperkin Exp $
+$NetBSD: patch-setup.py,v 1.3 2017/03/30 11:42:58 adam Exp $
 
 Disable modules, so they can be built as separate packages.
 
---- setup.py.orig	2016-12-23 02:21:22.000000000 +0000
+--- setup.py.orig	2017-03-21 06:32:38.000000000 +0000
 +++ setup.py
 @@ -8,6 +8,7 @@ import importlib.util
  import sysconfig
@@ -47,7 +47,7 @@ Disable modules, so they can be built as separate packages.
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -811,8 +813,7 @@ class PyBuildExt(build_ext):
+@@ -812,8 +814,7 @@ class PyBuildExt(build_ext):
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
@@ -57,7 +57,7 @@ Disable modules, so they can be built as separate packages.
                               ]
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
                               search_for_ssl_incs_in
-@@ -823,9 +824,7 @@ class PyBuildExt(build_ext):
+@@ -824,9 +825,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -68,7 +68,7 @@ Disable modules, so they can be built as separate packages.
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -844,7 +843,7 @@ class PyBuildExt(build_ext):
+@@ -845,7 +844,7 @@ class PyBuildExt(build_ext):
  
          # look for the openssl version header on the compiler search path.
          opensslv_h = find_file('openssl/opensslv.h', [],
@@ -77,7 +77,7 @@ Disable modules, so they can be built as separate packages.
          if opensslv_h:
              name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
              if host_platform == 'darwin' and is_macosx_sdk_path(name):
-@@ -1241,6 +1240,30 @@ class PyBuildExt(build_ext):
+@@ -1242,6 +1241,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -108,7 +108,7 @@ Disable modules, so they can be built as separate packages.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1252,7 +1275,7 @@ class PyBuildExt(build_ext):
+@@ -1253,7 +1276,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -117,7 +117,7 @@ Disable modules, so they can be built as separate packages.
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -2058,10 +2081,7 @@ class PyBuildExt(build_ext):
+@@ -2060,10 +2083,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -126,10 +126,10 @@ Disable modules, so they can be built as separate packages.
 -                                                         '_decimal',
 -                                                         'libmpdec'))]
 +            include_dirs = ['Modules/_decimal/libmpdec']
-             libraries = []
+             libraries = self.detect_math_libs()
              sources = [
                '_decimal/_decimal.c',
-@@ -2298,7 +2318,7 @@ def main():
+@@ -2300,7 +2320,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in