19004593 update Python to 3.4.1
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 19 Jun 2014 13:53:07 -0700
changeset 1953 5c1face45dc8
parent 1952 edbaa9c65514
child 1954 32663e59626d
19004593 update Python to 3.4.1
components/python/python34/Makefile
components/python/python34/patches/00-dtrace.patch
components/python/python34/patches/01-bits.patch
components/python/python34/patches/03-setup.patch
components/python/python34/patches/05-studio-profile.patch
components/python/python34/patches/07-ucred.patch
components/python/python34/patches/08-dlpi.patch
components/python/python34/patches/10-rbac.patch
components/python/python34/patches/14-ossaudiodev.patch
components/python/python34/python-34.p5m
--- a/components/python/python34/Makefile	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/Makefile	Thu Jun 19 13:53:07 2014 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Python
-COMPONENT_VERSION=	3.4.0
+COMPONENT_VERSION=	3.4.1
 COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe
+    sha256:c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/python
 
-TPNO=			17691
+TPNO=			18022
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/python/python34/patches/00-dtrace.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/00-dtrace.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -1011,9 +1011,9 @@
 +if __name__ == '__main__':
 +    test_main()
 +
---- Python-3.4.0/Lib/test/test_sys.py
-+++ Python-3.4.0/Lib/test/test_sys.py
[email protected]@ -729,6 +729,7 @@
+--- Python-3.4.1/Lib/test/test_sys.py.~1~	2014-05-18 22:19:38.000000000 -0700
++++ Python-3.4.1/Lib/test/test_sys.py	2014-05-27 10:34:04.212950775 -0700
[email protected]@ -728,6 +728,7 @@
          self.assertEqual(sys.getsizeof(True, -1), size('') + self.longdigit)
  
      def test_objecttypes(self):
@@ -1021,7 +1021,7 @@
          # check all types defined in Objects/
          size = test.support.calcobjsize
          vsize = test.support.calcvobjsize
[email protected]@ -754,13 +755,17 @@
[email protected]@ -753,13 +754,17 @@
              return inner
          check(get_cell().__closure__[0], size('P'))
          # code
@@ -1042,8 +1042,8 @@
          # complex
          check(complex(0,1), size('2d'))
          # method_descriptor (descriptor object)
---- Python-3.4.0/Makefile.pre.in
-+++ Python-3.4.0/Makefile.pre.in
+--- Python-3.4.1/Makefile.pre.in.~1~	2014-05-18 22:19:39.000000000 -0700
++++ Python-3.4.1/Makefile.pre.in	2014-05-27 10:34:04.213739956 -0700
 @@ -52,6 +52,13 @@
  # Use this to make a link between python$(VERSION) and python in $(BINDIR)
  LN=		@[email protected]
@@ -1145,7 +1145,7 @@
  ############################################################################
  # Header files
  
[email protected]@ -1515,6 +1567,11 @@
[email protected]@ -1516,6 +1568,11 @@
  	find build -name '*.py[co]' -exec rm -f {} ';' || true
  	-rm -f pybuilddir.txt
  	-rm -f Lib/lib2to3/*Grammar*.pickle
@@ -1157,7 +1157,7 @@
  	-rm -f Modules/_testembed Modules/_freeze_importlib
  
  profile-removal:
[email protected]@ -1546,6 +1603,11 @@
[email protected]@ -1547,6 +1604,11 @@
  				     -o -name '*.orig' -o -name '*.rej' \
  				     -o -name '*.bak' ')' \
  				     -exec rm -f {} ';'
@@ -1219,8 +1219,8 @@
 +    }
 +    return m;
 +}
---- Python-3.4.0/Modules/gcmodule.c
-+++ Python-3.4.0/Modules/gcmodule.c
+--- Python-3.4.1/Modules/gcmodule.c.~1~	2014-05-18 22:19:39.000000000 -0700
++++ Python-3.4.1/Modules/gcmodule.c	2014-05-27 10:34:04.215193143 -0700
 @@ -26,6 +26,10 @@
  #include "Python.h"
  #include "frameobject.h"        /* for PyFrame_ClearFreeList */
@@ -1232,7 +1232,7 @@
  /* Get an object's GC head */
  #define AS_GC(o) ((PyGC_Head *)(o)-1)
  
[email protected]@ -905,7 +909,12 @@
[email protected]@ -917,7 +921,12 @@
  /* This is the main function.  Read this to understand how the
   * collection process works. */
  static Py_ssize_t
@@ -1246,7 +1246,7 @@
          int nofail)
  {
      int i;
[email protected]@ -1080,6 +1089,50 @@
[email protected]@ -1092,6 +1101,50 @@
      return n+m;
  }
  
@@ -1770,7 +1770,7 @@
    --with-fpectl           enable SIGFPE catching
    --with-libm=STRING      math library
    --with-libc=STRING      C library
[email protected]@ -10391,6 +10398,174 @@
[email protected]@ -10368,6 +10375,174 @@
      OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
  fi
  
@@ -1945,9 +1945,9 @@
  # -I${DLINCLDIR} is added to the compile rule for importdl.o
  
  DLINCLDIR=.
---- Python-3.4.0/configure.ac
-+++ Python-3.4.0/configure.ac
[email protected]@ -2868,6 +2868,62 @@
+--- Python-3.4.1/configure.ac.~1~	2014-05-18 22:19:40.000000000 -0700
++++ Python-3.4.1/configure.ac	2014-05-27 10:34:04.224755986 -0700
[email protected]@ -2857,6 +2857,62 @@
      OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
  fi
  
--- a/components/python/python34/patches/01-bits.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/01-bits.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -2,8 +2,8 @@
 # This patch addresses problems with the configure script.
 # As it is Solaris-specific, it is not suitable for upstream.
 #
---- Python-3.4.0/configure.ac.~1~	2014-03-16 19:31:31.000000000 -0700
-+++ Python-3.4.0/configure.ac	2014-03-17 11:11:22.990261823 -0700
+--- Python-3.4.1/configure.ac.~2~	2014-05-27 10:56:02.639102829 -0700
++++ Python-3.4.1/configure.ac	2014-05-27 10:56:02.659169307 -0700
 @@ -5,7 +5,7 @@
  # Set VERSION so we only need to edit in one place (i.e., here)
  m4_define(PYTHON_VERSION, 3.4)
@@ -13,7 +13,7 @@
  
  AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
  
[email protected]@ -2108,12 +2108,6 @@
[email protected]@ -2097,12 +2097,6 @@
  if test -z "$CCSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
--- a/components/python/python34/patches/03-setup.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/03-setup.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -1,8 +1,8 @@
 This patch modifies the setup script to support Solaris.
 As it is Solaris-specific, it is not suitable for upstream.
 
---- Python-3.4.0/setup.py.~2~	2014-03-19 10:36:25.778101571 -0700
-+++ Python-3.4.0/setup.py	2014-03-19 10:36:25.855568930 -0700
+--- Python-3.4.1/setup.py.~2~	2014-05-27 10:58:02.374409887 -0700
++++ Python-3.4.1/setup.py	2014-05-27 10:58:02.415203920 -0700
 @@ -728,6 +728,13 @@
                                                       ['/usr/lib/termcap'],
                                                       'termcap'):
@@ -17,7 +17,7 @@
              exts.append( Extension('readline', ['readline.c'],
                                     library_dirs=['/usr/lib/termcap'],
                                     extra_link_args=readline_extra_link_args,
[email protected]@ -1900,7 +1907,7 @@
[email protected]@ -1910,7 +1917,7 @@
              # this option. If you want to compile ctypes with the Sun
              # compiler, please research a proper solution, instead of
              # finding some -z option for the Sun compiler.
--- a/components/python/python34/patches/05-studio-profile.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/05-studio-profile.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -4,8 +4,8 @@
 that the profiling options be used at all steps of the build -- not just
 compilation.  As it is Solaris-specific, it is not suitable for upstream.
 
---- Python-3.4.0/Makefile.pre.in.~2~	2014-03-19 10:42:20.230354945 -0700
-+++ Python-3.4.0/Makefile.pre.in	2014-03-19 10:42:20.412767814 -0700
+--- Python-3.4.1/Makefile.pre.in.~2~	2014-05-27 11:00:11.343553051 -0700
++++ Python-3.4.1/Makefile.pre.in	2014-05-27 11:00:11.424599176 -0700
 @@ -472,30 +472,39 @@
  profile-opt:
  	@echo "Building with support for profile generation:"
@@ -66,7 +66,7 @@
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
[email protected]@ -1575,7 +1580,7 @@
[email protected]@ -1576,7 +1581,7 @@
  	-rm -f Modules/_testembed Modules/_freeze_importlib
  
  profile-removal:
--- a/components/python/python34/patches/07-ucred.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/07-ucred.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -410,9 +410,9 @@
 +
 +	return m;
 +}
---- Python-3.4.0/setup.py.~3~	2014-03-19 10:44:16.508585670 -0700
-+++ Python-3.4.0/setup.py	2014-03-19 10:44:16.596735089 -0700
[email protected]@ -1467,6 +1467,13 @@
+--- Python-3.4.1/setup.py.~3~	2014-05-27 11:02:30.818966992 -0700
++++ Python-3.4.1/setup.py	2014-05-27 11:02:30.872276167 -0700
[email protected]@ -1477,6 +1477,13 @@
          # Stefan Krah's _decimal module
          exts.append(self._decimal_ext())
  
--- a/components/python/python34/patches/08-dlpi.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/08-dlpi.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -1223,9 +1223,9 @@
 +
 +	return mod;
 +}
---- Python-3.4.0/setup.py.~4~	2014-03-19 10:45:51.118227834 -0700
-+++ Python-3.4.0/setup.py	2014-03-19 10:45:51.146201564 -0700
[email protected]@ -1474,6 +1474,12 @@
+--- Python-3.4.1/setup.py.~4~	2014-05-27 11:03:49.734697487 -0700
++++ Python-3.4.1/setup.py	2014-05-27 11:03:49.752000275 -0700
[email protected]@ -1484,6 +1484,12 @@
              exts.append( Extension('ucred', ['ucred.c'],
                                     libraries = ['tsol']) )
  
--- a/components/python/python34/patches/10-rbac.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/10-rbac.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -1283,9 +1283,9 @@
 +	0,                            /* tp_free */
 +	0,                            /* tp_is_gc */
 +};
---- Python-3.4.0/setup.py.~5~	2014-03-19 10:47:07.143319629 -0700
-+++ Python-3.4.0/setup.py	2014-03-19 10:47:07.193485865 -0700
[email protected]@ -1480,6 +1480,22 @@
+--- Python-3.4.1/setup.py.~5~	2014-05-27 11:04:39.778356512 -0700
++++ Python-3.4.1/setup.py	2014-05-27 11:04:39.805225961 -0700
[email protected]@ -1490,6 +1490,22 @@
              exts.append( Extension('dlpi', ['dlpimodule.c'],
                                     libraries = ['dlpi']) )
  
--- a/components/python/python34/patches/14-ossaudiodev.patch	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/patches/14-ossaudiodev.patch	Thu Jun 19 13:53:07 2014 -0700
@@ -2,9 +2,9 @@
 Some OSS ioctls are not supported on Solaris, so they are ifdef'd out.  As
 the patch is Solaris-specific, it is not suitable for upstream.
 
---- Python-3.4.0/setup.py.~6~	2014-03-19 10:50:15.496976758 -0700
-+++ Python-3.4.0/setup.py	2014-03-19 10:50:15.609798728 -0700
[email protected]@ -1551,7 +1551,7 @@
+--- Python-3.4.1/setup.py.~6~	2014-05-27 11:05:28.340471151 -0700
++++ Python-3.4.1/setup.py	2014-05-27 11:05:28.416962700 -0700
[email protected]@ -1561,7 +1561,7 @@
          # End multiprocessing
  
          # Platform-specific libraries
--- a/components/python/python34/python-34.p5m	Thu Jun 19 02:03:25 2014 -0700
+++ b/components/python/python34/python-34.p5m	Thu Jun 19 13:53:07 2014 -0700
@@ -708,6 +708,7 @@
 file path=usr/lib/python3.4/idlelib/idle.pyw
 file path=usr/lib/python3.4/idlelib/idle_test/README.txt
 file path=usr/lib/python3.4/idlelib/idle_test/__init__.py
+file path=usr/lib/python3.4/idlelib/idle_test/htest.py
 file path=usr/lib/python3.4/idlelib/idle_test/mock_idle.py
 file path=usr/lib/python3.4/idlelib/idle_test/mock_tk.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_calltips.py
@@ -1345,20 +1346,6 @@
 file path=usr/lib/python3.4/test/mock_socket.py
 file path=usr/lib/python3.4/test/mp_fork_bomb.py
 file path=usr/lib/python3.4/test/multibytecodec_support.py
-file path=usr/lib/python3.4/test/namespace_pkgs/both_portions/foo/one.py
-file path=usr/lib/python3.4/test/namespace_pkgs/both_portions/foo/two.py
-file path=usr/lib/python3.4/test/namespace_pkgs/missing_directory.zip
-file path=usr/lib/python3.4/test/namespace_pkgs/module_and_namespace_package/a_test.py
-file path=usr/lib/python3.4/test/namespace_pkgs/module_and_namespace_package/a_test/empty
-file path=usr/lib/python3.4/test/namespace_pkgs/nested_portion1.zip
-file path=usr/lib/python3.4/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
-file path=usr/lib/python3.4/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py
-file path=usr/lib/python3.4/test/namespace_pkgs/portion1/foo/one.py
-file path=usr/lib/python3.4/test/namespace_pkgs/portion2/foo/two.py
-file path=usr/lib/python3.4/test/namespace_pkgs/project1/parent/child/one.py
-file path=usr/lib/python3.4/test/namespace_pkgs/project2/parent/child/two.py
-file path=usr/lib/python3.4/test/namespace_pkgs/project3/parent/child/three.py
-file path=usr/lib/python3.4/test/namespace_pkgs/top_level_portion1.zip
 file path=usr/lib/python3.4/test/nokia.pem
 file path=usr/lib/python3.4/test/nullbytecert.pem
 file path=usr/lib/python3.4/test/nullcert.pem
@@ -1448,7 +1435,6 @@
 file path=usr/lib/python3.4/test/test_asyncio/test_unix_events.py
 file path=usr/lib/python3.4/test/test_asyncio/test_windows_events.py
 file path=usr/lib/python3.4/test/test_asyncio/test_windows_utils.py
-file path=usr/lib/python3.4/test/test_asyncio/tests.txt
 file path=usr/lib/python3.4/test/test_asyncore.py
 file path=usr/lib/python3.4/test/test_atexit.py
 file path=usr/lib/python3.4/test/test_audioop.py
@@ -1694,6 +1680,20 @@
 file path=usr/lib/python3.4/test/test_importlib/import_/test_path.py
 file path=usr/lib/python3.4/test/test_importlib/import_/test_relative_imports.py
 file path=usr/lib/python3.4/test/test_importlib/import_/util.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/missing_directory.zip
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/nested_portion1.zip
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/portion1/foo/one.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/portion2/foo/two.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
+file path=usr/lib/python3.4/test/test_importlib/namespace_pkgs/top_level_portion1.zip
 file path=usr/lib/python3.4/test/test_importlib/regrtest.py
 file path=usr/lib/python3.4/test/test_importlib/source/__init__.py
 file path=usr/lib/python3.4/test/test_importlib/source/test_case_sensitivity.py
@@ -1705,6 +1705,7 @@
 file path=usr/lib/python3.4/test/test_importlib/test_abc.py
 file path=usr/lib/python3.4/test/test_importlib/test_api.py
 file path=usr/lib/python3.4/test/test_importlib/test_locks.py
+file path=usr/lib/python3.4/test/test_importlib/test_namespace_pkgs.py
 file path=usr/lib/python3.4/test/test_importlib/test_spec.py
 file path=usr/lib/python3.4/test/test_importlib/test_util.py
 file path=usr/lib/python3.4/test/test_importlib/test_windows.py
@@ -1773,7 +1774,6 @@
 file path=usr/lib/python3.4/test/test_multiprocessing_forkserver.py
 file path=usr/lib/python3.4/test/test_multiprocessing_main_handling.py
 file path=usr/lib/python3.4/test/test_multiprocessing_spawn.py
-file path=usr/lib/python3.4/test/test_namespace_pkgs.py
 file path=usr/lib/python3.4/test/test_netrc.py
 file path=usr/lib/python3.4/test/test_nis.py
 file path=usr/lib/python3.4/test/test_nntplib.py