20230129 update Python 2.7 line to version 2.7.9
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 17 Dec 2014 09:46:51 -0800
changeset 3555 76f4672c5e4b
parent 3554 ef58713bafc4
child 3557 39d5a85cfd14
20230129 update Python 2.7 line to version 2.7.9 20207552 problem in UTILITY/PYTHON
components/python/python27/Makefile
components/python/python27/patches/00-bits.patch
components/python/python27/patches/02-setup.patch
components/python/python27/patches/05-dtrace.patch
components/python/python27/patches/06-ucred.patch
components/python/python27/patches/07-dlpi.patch
components/python/python27/patches/09-rbac.patch
components/python/python27/patches/10-cflags.patch
components/python/python27/patches/12-studio-profile.patch
components/python/python27/patches/13-pic-compile.patch
components/python/python27/patches/14-py_db.patch
components/python/python27/patches/16-ossaudiodev.patch
components/python/python27/patches/20-bsddb-harmful.patch
components/python/python27/patches/21-test_tcl.patch
components/python/python27/python-27-tests.p5m
components/python/python27/python-27.p5m
components/python/python27/resolve.deps
tools/.gnupg/pubring.gpg
--- a/components/python/python27/Makefile	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/Makefile	Wed Dec 17 09:46:51 2014 -0800
@@ -26,16 +26,17 @@
 PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
 
 COMPONENT_NAME=		Python
-COMPONENT_VERSION=	2.7.8
+COMPONENT_VERSION=	2.7.9
 COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a
+    sha256:90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_SIG_URL=	$(COMPONENT_ARCHIVE_URL).asc
 COMPONENT_BUGDB=	utility/python
 
-TPNO=			18461
+TPNO=			20750
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/python/python27/patches/00-bits.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/00-bits.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -2,8 +2,8 @@
 # This patch makes the pyconfig.h header file 32/64 bit friendly.
 # As it is Solaris-specific, it is not suitable for upstream.
 #
---- Python-2.7.8/configure.ac.~1~	2014-06-29 19:05:48.000000000 -0700
-+++ Python-2.7.8/configure.ac	2014-07-17 20:31:45.866247571 -0700
+--- Python-2.7.9/configure.ac.~1~	2014-12-10 08:00:00.000000000 -0800
++++ Python-2.7.9/configure.ac	2014-12-11 09:13:54.706541603 -0800
 @@ -5,7 +5,7 @@
  # Set VERSION so we only need to edit in one place (i.e., here)
  m4_define(PYTHON_VERSION, 2.7)
@@ -13,7 +13,7 @@
  
  AC_REVISION($Revision$)
  AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/)
[email protected]@ -2092,12 +2092,6 @@
[email protected]@ -2095,12 +2095,6 @@
  if test -z "$CCSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
--- a/components/python/python27/patches/02-setup.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/02-setup.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1,9 +1,9 @@
 This patch modifies the setup script to support Solaris.
 As it is Solaris-specific, it is not suitable for upstream.
 
---- Python-2.7.8/setup.py.~1~	2014-06-29 19:05:48.000000000 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:37:57.419011542 -0700
[email protected]@ -437,9 +437,9 @@
+--- Python-2.7.9/setup.py.~1~	2014-12-10 08:00:01.000000000 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:16:17.426317139 -0800
[email protected]@ -439,9 +439,9 @@
  
      def detect_modules(self):
          # Ensure that /usr/local is always used
@@ -16,7 +16,7 @@
          if cross_compiling:
              self.add_gcc_paths()
          self.add_multiarch_paths()
[email protected]@ -763,6 +763,13 @@
[email protected]@ -765,6 +765,13 @@
                                                       ['/usr/lib/termcap'],
                                                       'termcap'):
                  readline_libs.append('termcap')
@@ -30,7 +30,7 @@
              exts.append( Extension('readline', ['readline.c'],
                                     library_dirs=['/usr/lib/termcap'],
                                     extra_link_args=readline_extra_link_args,
[email protected]@ -2081,7 +2088,8 @@
[email protected]@ -2083,7 +2090,8 @@
              # 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/python27/patches/05-dtrace.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/05-dtrace.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -7,9 +7,9 @@
 Follow http://bugs.python.org/issue13405 for plans to get it
 integrated into the main tree.
 
---- Python-2.7.6/Makefile.pre.in.~1~	2013-11-09 23:36:41.000000000 -0800
-+++ Python-2.7.6/Makefile.pre.in	2014-05-14 12:54:43.824219677 -0700
[email protected]@ -218,6 +218,7 @@
+--- Python-2.7.9/Makefile.pre.in.~1~	2014-12-10 07:59:50.000000000 -0800
++++ Python-2.7.9/Makefile.pre.in	2014-12-11 09:17:26.137440092 -0800
[email protected]@ -221,6 +221,7 @@
  # Used of signalmodule.o is not available
  SIGNAL_OBJS=	@[email protected]
  
@@ -17,7 +17,7 @@
  
  ##########################################################################
  # Grammar
[email protected]@ -341,6 +342,7 @@
[email protected]@ -344,6 +345,7 @@
  		Python/formatter_unicode.o \
  		Python/formatter_string.o \
  		Python/$(DYNLOADFILE) \
@@ -25,7 +25,7 @@
  		$(LIBOBJS) \
  		$(MACHDEP_OBJS) \
  		$(THREADOBJ)
[email protected]@ -664,6 +666,18 @@
[email protected]@ -677,6 +679,18 @@
  Python/formatter_string.o: $(srcdir)/Python/formatter_string.c \
  				$(STRINGLIB_HEADERS)
  
@@ -64,8 +64,8 @@
      f->f_lineno = code->co_firstlineno;
      f->f_iblock = 0;
  
---- Python-2.7.8/Python/ceval.c.~1~	2014-06-29 19:05:46.000000000 -0700
-+++ Python-2.7.8/Python/ceval.c	2014-07-17 20:39:49.843868592 -0700
+--- Python-2.7.9/Python/ceval.c.~1~	2014-12-10 07:59:58.000000000 -0800
++++ Python-2.7.9/Python/ceval.c	2014-12-11 09:19:01.398584575 -0800
 @@ -19,6 +19,11 @@
  
  #include <ctype.h>
@@ -78,7 +78,7 @@
  #ifndef WITH_TSC
  
  #define READ_TIMESTAMP(var)
[email protected]@ -678,6 +683,55 @@
[email protected]@ -672,6 +677,55 @@
                        NULL);
  }
  
@@ -134,7 +134,7 @@
  
  /* Interpreter main loop */
  
[email protected]@ -689,9 +743,84 @@
[email protected]@ -683,9 +737,84 @@
      return PyEval_EvalFrameEx(f, 0);
  }
  
@@ -219,7 +219,7 @@
  #ifdef DXPAIRS
      int lastopcode = 0;
  #endif
[email protected]@ -916,6 +1045,11 @@
[email protected]@ -910,6 +1039,11 @@
          }
      }
  
@@ -419,9 +419,9 @@
 +#pragma D attributes Private/Private/Common provider python function
 +#pragma D attributes Evolving/Evolving/Common provider python name
 +#pragma D attributes Evolving/Evolving/Common provider python args
---- Python-2.7.7/Lib/test/test_sys.py.~1~	2014-05-31 11:58:39.000000000 -0700
-+++ Python-2.7.7/Lib/test/test_sys.py	2014-06-02 10:44:39.318709539 -0700
[email protected]@ -594,7 +594,7 @@
+--- Python-2.7.9/Lib/test/test_sys.py.~1~	2014-12-10 07:59:47.000000000 -0800
++++ Python-2.7.9/Lib/test/test_sys.py	2014-12-11 09:20:26.361157717 -0800
[email protected]@ -619,7 +619,7 @@
          nfrees = len(x.f_code.co_freevars)
          extras = x.f_code.co_stacksize + x.f_code.co_nlocals +\
                   ncells + nfrees - 1
--- a/components/python/python27/patches/06-ucred.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/06-ucred.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -394,9 +394,9 @@
 +
 +	PyModule_AddObject(m, "ucred", (PyObject *)&pyucred_type);
 +}
---- Python-2.7.8/setup.py.~2~	2014-07-17 20:41:55.688200021 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:41:55.733063564 -0700
[email protected]@ -1542,6 +1542,13 @@
+--- Python-2.7.9/setup.py.~2~	2014-12-11 09:21:22.692567515 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:21:22.772123046 -0800
[email protected]@ -1544,6 +1544,13 @@
          else:
              missing.append('dl')
  
--- a/components/python/python27/patches/07-dlpi.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/07-dlpi.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1209,9 +1209,9 @@
 +	PyModule_AddIntConstant(mod, "IDLE", DL_IDLE);
 +	PyModule_AddIntConstant(mod, "SYSERR", DL_SYSERR);
 +}
---- Python-2.7.8/setup.py.~3~	2014-07-17 20:43:48.715101356 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:43:48.731874294 -0700
[email protected]@ -1549,6 +1549,12 @@
+--- Python-2.7.9/setup.py.~3~	2014-12-11 09:22:38.862438509 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:22:38.882370033 -0800
[email protected]@ -1551,6 +1551,12 @@
              exts.append( Extension('ucred', ['ucred.c'],
                                     libraries = ['tsol']) )
  
--- a/components/python/python27/patches/09-rbac.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/09-rbac.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1253,9 +1253,9 @@
 +	0,                         /* tp_alloc */
 +	Userattr_new,                 /* tp_new */
 +};
---- Python-2.7.8/setup.py.~4~	2014-07-17 20:44:54.016102084 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:44:54.040843123 -0700
[email protected]@ -1555,6 +1555,22 @@
+--- Python-2.7.9/setup.py.~4~	2014-12-11 09:23:44.034373292 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:23:44.069264725 -0800
[email protected]@ -1557,6 +1557,22 @@
              exts.append( Extension('dlpi', ['dlpimodule.c'],
                                     libraries = ['dlpi']) )
  
--- a/components/python/python27/patches/10-cflags.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/10-cflags.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1,8 +1,8 @@
 This patch is Solaris-specific and thus not suitable for upstream.
 
---- Python-2.7.6/configure.ac.~2~	2014-05-14 13:20:24.767295632 -0700
-+++ Python-2.7.6/configure.ac	2014-05-14 13:20:25.052695991 -0700
[email protected]@ -1083,7 +1083,7 @@
+--- Python-2.7.9/configure.ac.~2~	2014-12-11 09:25:29.893198436 -0800
++++ Python-2.7.9/configure.ac	2014-12-11 09:25:30.062473872 -0800
[email protected]@ -1086,7 +1086,7 @@
  	;;
  
      *)
--- a/components/python/python27/patches/12-studio-profile.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/12-studio-profile.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -4,9 +4,9 @@
 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-2.7.8/Makefile.pre.in.~2~	2014-07-17 20:46:10.626664937 -0700
-+++ Python-2.7.8/Makefile.pre.in	2014-07-17 20:46:10.736821411 -0700
[email protected]@ -413,28 +413,37 @@
+--- Python-2.7.9/Makefile.pre.in.~2~	2014-12-11 09:26:43.160400840 -0800
++++ Python-2.7.9/Makefile.pre.in	2014-12-11 09:26:43.287536256 -0800
[email protected]@ -416,28 +416,37 @@
  profile-opt:
  	@echo "Building with support for profile generation:"
  	$(MAKE) clean
@@ -49,7 +49,7 @@
  
  
  # Build the interpreter
[email protected]@ -1298,7 +1307,7 @@
[email protected]@ -1331,7 +1340,7 @@
  	-rm -f Lib/lib2to3/*Grammar*.pickle
  
  profile-removal:
--- a/components/python/python27/patches/13-pic-compile.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/13-pic-compile.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1,8 +1,8 @@
 This patch is a Solaris-specific hack; it will not be submitted upstream.
 
---- Python-2.7.6/Lib/distutils/sysconfig.py.~1~	2013-11-09 23:36:40.000000000 -0800
-+++ Python-2.7.6/Lib/distutils/sysconfig.py	2014-05-14 13:33:21.453593946 -0700
[email protected]@ -208,6 +208,15 @@
+--- Python-2.7.9/Lib/distutils/sysconfig.py.~1~	2014-12-10 07:59:34.000000000 -0800
++++ Python-2.7.9/Lib/distutils/sysconfig.py	2014-12-11 09:28:01.439349129 -0800
[email protected]@ -209,6 +209,15 @@
          else:
              archiver = ar + ' ' + ar_flags
  
--- a/components/python/python27/patches/14-py_db.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/14-py_db.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -1,9 +1,9 @@
 This patch adds Python debugger support.  It may be contributed upstream at
 some point, but the suitability (or lack thereof) has not yet been determined.
 
---- Python-2.7.7/Makefile.pre.in.~3~	2014-06-02 10:54:32.421086337 -0700
-+++ Python-2.7.7/Makefile.pre.in	2014-06-02 10:54:32.438134113 -0700
[email protected]@ -407,7 +407,7 @@
+--- Python-2.7.9/Makefile.pre.in.~3~	2014-12-11 09:28:46.856724815 -0800
++++ Python-2.7.9/Makefile.pre.in	2014-12-11 09:30:15.502371832 -0800
[email protected]@ -410,7 +410,7 @@
  
  # Default target
  all:		build_all
@@ -12,7 +12,7 @@
  
  # Compile a binary with gcc profile guided optimization.
  profile-opt:
[email protected]@ -778,6 +778,15 @@
[email protected]@ -791,6 +791,15 @@
  
  $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
  
@@ -28,15 +28,15 @@
  
  ######################################################################
  
[email protected]@ -842,7 +851,7 @@
[email protected]@ -855,7 +864,7 @@
  		$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
  
  # Install everything
--install:	@[email protected] altinstall bininstall maninstall @[email protected]
-+install:	@[email protected] altinstall bininstall maninstall @[email protected] install-py_db
- 
- # Install almost everything without disturbing previous versions
- altinstall:	@[email protected] altbininstall libinstall inclinstall \
+-install:	@[email protected] commoninstall bininstall maninstall @[email protected]
++install:	@[email protected] commoninstall bininstall maninstall @F[email protected] install-py_db
+ 	if test "x$(ENSUREPIP)" != "xno"  ; then \
+ 		case $(ENSUREPIP) in \
+ 			upgrade) ensurepip="--upgrade" ;; \
 --- /dev/null
 +++ Python-2.7.1/py_db/libpython27_db.c
 @@ -0,0 +1,654 @@
--- a/components/python/python27/patches/16-ossaudiodev.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/16-ossaudiodev.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -47,9 +47,9 @@
      _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE);
 +#endif
  }
---- Python-2.7.8/setup.py.~5~	2014-07-17 20:47:50.251398063 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:47:50.359537973 -0700
[email protected]@ -1638,8 +1638,8 @@
+--- Python-2.7.9/setup.py.~5~	2014-12-11 09:31:54.006321120 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:31:54.147262938 -0800
[email protected]@ -1640,8 +1640,8 @@
          else:
              missing.append('linuxaudiodev')
  
--- a/components/python/python27/patches/20-bsddb-harmful.patch	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/patches/20-bsddb-harmful.patch	Wed Dec 17 09:46:51 2014 -0800
@@ -3,10 +3,10 @@
 dump core.  So skip it.  The module is removed in Python 3, so this patch
 is not being submitted upstream.
 
---- Python-2.7.7/Makefile.pre.in.~4~	2014-06-02 11:08:40.909703116 -0700
-+++ Python-2.7.7/Makefile.pre.in	2014-06-02 11:08:40.977964319 -0700
[email protected]@ -971,7 +971,7 @@
- 		email email/mime email/test email/test/data \
+--- Python-2.7.9/Makefile.pre.in.~4~	2014-12-11 09:33:27.006970089 -0800
++++ Python-2.7.9/Makefile.pre.in	2014-12-11 09:33:27.077073582 -0800
[email protected]@ -1004,7 +1004,7 @@
+ 		ensurepip ensurepip/_bundled \
  		json json/tests \
  		sqlite3 sqlite3/test \
 -		logging bsddb bsddb/test csv importlib wsgiref \
@@ -14,9 +14,9 @@
  		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
  		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
  		ctypes ctypes/test ctypes/macholib \
---- Python-2.7.8/setup.py.~6~	2014-07-17 20:49:23.834928506 -0700
-+++ Python-2.7.8/setup.py	2014-07-17 20:49:23.872603149 -0700
[email protected]@ -1067,7 +1067,8 @@
+--- Python-2.7.9/setup.py.~6~	2014-12-11 09:35:14.246397752 -0800
++++ Python-2.7.9/setup.py	2014-12-11 09:35:14.274861676 -0800
[email protected]@ -1069,7 +1069,8 @@
                                      db_dirs_to_check + lib_dirs, dblib )
                      if dblib_file:
                          dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
--- a/components/python/python27/patches/21-test_tcl.patch	Tue Dec 16 02:22:32 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-This patch comes from upstream: http://bugs.python.org/issue21881
-
---- Python-2.7.8/Lib/test/test_tcl.py.~1~	2014-06-29 19:05:37.000000000 -0700
-+++ Python-2.7.8/Lib/test/test_tcl.py	2014-07-17 20:50:53.804037105 -0700
[email protected]@ -420,10 +420,9 @@
-             self.assertEqual(passValue(float('inf')), float('inf'))
-             self.assertEqual(passValue(-float('inf')), -float('inf'))
-         else:
--            f = float(passValue(float('nan')))
--            self.assertNotEqual(f, f)
-             self.assertEqual(float(passValue(float('inf'))), float('inf'))
-             self.assertEqual(float(passValue(-float('inf'))), -float('inf'))
-+            # XXX NaN representation can be not parsable by float()
-         self.assertEqual(passValue((1, '2', (3.4,))),
-                          (1, '2', (3.4,)) if self.wantobjects else '1 2 3.4')
- 
[email protected]@ -448,9 +447,6 @@
-             expected = float(expected)
-             self.assertAlmostEqual(float(actual), expected,
-                                    delta=abs(expected) * 1e-10)
--        def nan_eq(actual, expected):
--            actual = float(actual)
--            self.assertNotEqual(actual, actual)
- 
-         check(True, '1')
-         check(False, '0')
[email protected]@ -474,7 +470,7 @@
-             check(f, f, eq=float_eq)
-         check(float('inf'), 'Inf', eq=float_eq)
-         check(-float('inf'), '-Inf', eq=float_eq)
--        check(float('nan'), 'NaN', eq=nan_eq)
-+        # XXX NaN representation can be not parsable by float()
-         check((), '')
-         check((1, (2,), (3, 4), '5 6', ()), '1 2 {3 4} {5 6} {}')
- 
--- a/components/python/python27/python-27-tests.p5m	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/python-27-tests.p5m	Wed Dec 17 09:46:51 2014 -0800
@@ -206,6 +206,7 @@
 file path=usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_calltips.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_config_name.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_configdialog.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_delegator.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_grep.py
@@ -214,10 +215,12 @@
 file path=usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_rstrip.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_searchengine.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_text.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_textview.py
 file path=usr/lib/python2.7/idlelib/idle_test/test_warning.py
+file path=usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py
 file path=usr/lib/python2.7/idlelib/testcode.py
 file path=usr/lib/python2.7/json/tests/__init__.py
 file path=usr/lib/python2.7/json/tests/test_check_circular.py
@@ -244,6 +247,7 @@
 file path=usr/lib/python2.7/lib-tk/test/README
 file path=usr/lib/python2.7/lib-tk/test/runtktests.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py
+file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py
 file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py
@@ -257,6 +261,7 @@
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_style.py
 file path=usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py
 file path=usr/lib/python2.7/lib-tk/test/widget_tests.py
+file path=usr/lib/python2.7/lib2to3/fixes/fix_asserts.py
 file path=usr/lib/python2.7/lib2to3/tests/__init__.py
 file path=usr/lib/python2.7/lib2to3/tests/data/README
 file path=usr/lib/python2.7/lib2to3/tests/data/bom.py
@@ -298,6 +303,7 @@
 file path=usr/lib/python2.7/test/185test.db
 file path=usr/lib/python2.7/test/Sine-1000Hz-300ms.aif
 file path=usr/lib/python2.7/test/__init__.py
+file path=usr/lib/python2.7/test/_mock_backport.py
 file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
 file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.au
 file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
@@ -328,6 +334,10 @@
 file path=usr/lib/python2.7/test/badsyntax_future9.py
 file path=usr/lib/python2.7/test/badsyntax_nocaret.py
 file path=usr/lib/python2.7/test/buffer_tests.py
+file path=usr/lib/python2.7/test/capath/4e1295a3.0
+file path=usr/lib/python2.7/test/capath/5ed36f99.0
+file path=usr/lib/python2.7/test/capath/6e88d7b8.0
+file path=usr/lib/python2.7/test/capath/99d0fa06.0
 file path=usr/lib/python2.7/test/cfgparser.1
 file path=usr/lib/python2.7/test/check_soundcard.vbs
 file path=usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
@@ -506,6 +516,7 @@
 file path=usr/lib/python2.7/test/decimaltestdata/tointegral.decTest
 file path=usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest
 file path=usr/lib/python2.7/test/decimaltestdata/xor.decTest
+file path=usr/lib/python2.7/test/dh512.pem
 file path=usr/lib/python2.7/test/dlpitest.py
 file path=usr/lib/python2.7/test/doctest_aliases.py
 file path=usr/lib/python2.7/test/double_const.py
@@ -532,9 +543,14 @@
 file path=usr/lib/python2.7/test/infinite_reload.py
 file path=usr/lib/python2.7/test/inspect_fodder.py
 file path=usr/lib/python2.7/test/inspect_fodder2.py
+file path=usr/lib/python2.7/test/keycert.passwd.pem
 file path=usr/lib/python2.7/test/keycert.pem
+file path=usr/lib/python2.7/test/keycert2.pem
+file path=usr/lib/python2.7/test/keycert3.pem
+file path=usr/lib/python2.7/test/keycert4.pem
 file path=usr/lib/python2.7/test/list_tests.py
 file path=usr/lib/python2.7/test/lock_tests.py
+file path=usr/lib/python2.7/test/make_ssl_certs.py
 file path=usr/lib/python2.7/test/mapping_tests.py
 file path=usr/lib/python2.7/test/math_testcases.txt
 file path=usr/lib/python2.7/test/mp_fork_bomb.py
@@ -545,6 +561,7 @@
 file path=usr/lib/python2.7/test/pickletester.py
 file path=usr/lib/python2.7/test/privrbactest.py
 file path=usr/lib/python2.7/test/profilee.py
+file path=usr/lib/python2.7/test/pycacert.pem
 file path=usr/lib/python2.7/test/pyclbr_input.py
 file path=usr/lib/python2.7/test/pydoc_mod.py
 file path=usr/lib/python2.7/test/pydocfodder.py
@@ -556,14 +573,20 @@
 file path=usr/lib/python2.7/test/regrtest.py
 file path=usr/lib/python2.7/test/relimport.py
 file path=usr/lib/python2.7/test/reperf.py
+file path=usr/lib/python2.7/test/revocation.crl
 file path=usr/lib/python2.7/test/sample_doctest.py
 file path=usr/lib/python2.7/test/sample_doctest_no_docstrings.py
 file path=usr/lib/python2.7/test/sample_doctest_no_doctests.py
 file path=usr/lib/python2.7/test/script_helper.py
+file path=usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem
 file path=usr/lib/python2.7/test/seq_tests.py
 file path=usr/lib/python2.7/test/sgml_input.html
 file path=usr/lib/python2.7/test/sha256.pem
 file path=usr/lib/python2.7/test/sortperf.py
+file path=usr/lib/python2.7/test/ssl_cert.pem
+file path=usr/lib/python2.7/test/ssl_key.passwd.pem
+file path=usr/lib/python2.7/test/ssl_key.pem
+file path=usr/lib/python2.7/test/ssl_servers.py
 file path=usr/lib/python2.7/test/string_tests.py
 file path=usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
 file path=usr/lib/python2.7/test/symlink_support.py
@@ -688,6 +711,7 @@
 file path=usr/lib/python2.7/test/test_email.py
 file path=usr/lib/python2.7/test/test_email_codecs.py
 file path=usr/lib/python2.7/test/test_email_renamed.py
+file path=usr/lib/python2.7/test/test_ensurepip.py
 file path=usr/lib/python2.7/test/test_enumerate.py
 file path=usr/lib/python2.7/test/test_eof.py
 file path=usr/lib/python2.7/test/test_epoll.py
@@ -922,6 +946,7 @@
 file path=usr/lib/python2.7/test/test_timeout.py
 file path=usr/lib/python2.7/test/test_tk.py
 file path=usr/lib/python2.7/test/test_tokenize.py
+file path=usr/lib/python2.7/test/test_tools.py
 file path=usr/lib/python2.7/test/test_trace.py
 file path=usr/lib/python2.7/test/test_traceback.py
 file path=usr/lib/python2.7/test/test_transformer.py
--- a/components/python/python27/python-27.p5m	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/python-27.p5m	Wed Dec 17 09:46:51 2014 -0800
@@ -229,6 +229,7 @@
 file path=usr/lib/python2.7/bdb.py
 file path=usr/lib/python2.7/binhex.py
 file path=usr/lib/python2.7/bisect.py
+# See 20206698 for why this bypass is needed.
 file path=usr/lib/python2.7/cProfile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/calendar.py
 file path=usr/lib/python2.7/cgi.py
@@ -494,6 +495,11 @@
 file path=usr/lib/python2.7/encodings/utf_8_sig.py
 file path=usr/lib/python2.7/encodings/uu_codec.py
 file path=usr/lib/python2.7/encodings/zlib_codec.py
+file path=usr/lib/python2.7/ensurepip/__init__.py
+file path=usr/lib/python2.7/ensurepip/__main__.py
+file path=usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
+file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+file path=usr/lib/python2.7/ensurepip/_uninstall.py
 file path=usr/lib/python2.7/filecmp.py
 file path=usr/lib/python2.7/fileinput.py
 file path=usr/lib/python2.7/fnmatch.py
@@ -869,6 +875,7 @@
 file path=usr/lib/python2.7/os.py
 file path=usr/lib/python2.7/os2emxpath.py
 file path=usr/lib/python2.7/pdb.doc
+# See 20206698 for why this bypass is needed.
 file path=usr/lib/python2.7/pdb.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pickle.py
 file path=usr/lib/python2.7/pickletools.py
@@ -881,6 +888,9 @@
 file path=usr/lib/python2.7/plat-sunos5/SUNAUDIODEV.py
 file path=usr/lib/python2.7/plat-sunos5/TYPES.py
 file path=usr/lib/python2.7/plat-sunos5/regen mode=0555
+# platform.py and profile.py attempt to import a bunch of things that only
+# exist on other platforms (e.g., Windows, MacOS): a long bypass list could
+# work around this, but ".*" is simpler in this case.
 file path=usr/lib/python2.7/platform.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/plistlib.py
 file path=usr/lib/python2.7/popen2.py
@@ -888,6 +898,7 @@
 file path=usr/lib/python2.7/posixfile.py
 file path=usr/lib/python2.7/posixpath.py
 file path=usr/lib/python2.7/pprint.py
+# See comment just above about platform.py and profile.py.
 file path=usr/lib/python2.7/profile.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/pstats.py
 file path=usr/lib/python2.7/pty.py
@@ -915,6 +926,7 @@
 file path=usr/lib/python2.7/site-packages/README
 file path=usr/lib/python2.7/site-packages/vendor-packages.pth
 file path=usr/lib/python2.7/site.py
+# See 20206698 for why this bypass is needed.
 file path=usr/lib/python2.7/smtpd.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/smtplib.py
 file path=usr/lib/python2.7/sndhdr.py
@@ -950,6 +962,7 @@
 file path=usr/lib/python2.7/toaiff.py
 file path=usr/lib/python2.7/token.py
 file path=usr/lib/python2.7/tokenize.py
+# See 20206698 for why this bypass is needed.
 file path=usr/lib/python2.7/trace.py pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.7/traceback.py
 file path=usr/lib/python2.7/tty.py
--- a/components/python/python27/resolve.deps	Tue Dec 16 02:22:32 2014 -0800
+++ b/components/python/python27/resolve.deps	Wed Dec 17 09:46:51 2014 -0800
@@ -5,6 +5,7 @@
 library/expat
 library/libffi
 library/ncurses
+library/python/pip-27
 library/readline
 library/security/openssl
 library/zlib
Binary file tools/.gnupg/pubring.gpg has changed