19782913 update Python to 3.4.2
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 29 Oct 2014 14:12:28 -0700
changeset 2183 5d00686e81da
parent 2182 9f1202f3ddbd
child 2184 32c5cf5b5dc1
19782913 update Python to 3.4.2
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/06-solaris-64-bit.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/12-py_db.patch
components/python/python34/patches/14-ossaudiodev.patch
components/python/python34/patches/15-include.patch
components/python/python34/patches/16-pic-compile.patch
components/python/python34/patches/18-pymalloc.patch
components/python/python34/patches/19-SOABI.patch
components/python/python34/python-34.p5m
components/python/python34/python34.license
components/python/python34/tkinter-34.p5m
--- a/components/python/python34/Makefile	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/Makefile	Wed Oct 29 14:12:28 2014 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		Python
-COMPONENT_VERSION=	3.4.1
+COMPONENT_VERSION=	3.4.2
 COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4
+    sha256:1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/python
 
-TPNO=			18022
+TPNO=			19421
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/python/python34/patches/00-dtrace.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/00-dtrace.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1011,9 +1011,9 @@
 +if __name__ == '__main__':
 +    test_main()
 +
---- 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 @@
+--- Python-3.4.2/Lib/test/test_sys.py.~1~	2014-09-22 05:57:02.000000000 -0700
++++ Python-3.4.2/Lib/test/test_sys.py	2014-09-22 11:46:06.131047596 -0700
[email protected]@ -729,6 +729,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]@ -753,13 +754,17 @@
[email protected]@ -754,13 +755,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.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
+--- Python-3.4.2/Makefile.pre.in.~1~	2014-09-22 05:57:02.000000000 -0700
++++ Python-3.4.2/Makefile.pre.in	2014-09-22 11:47:52.199531636 -0700
 @@ -52,6 +52,13 @@
  # Use this to make a link between python$(VERSION) and python in $(BINDIR)
  LN=		@[email protected]
@@ -1058,7 +1058,7 @@
  # Portable install script (configure doesn't always guess right)
  INSTALL=	@[email protected]
  [email protected][email protected]
[email protected]@ -569,7 +576,7 @@
[email protected]@ -584,7 +591,7 @@
  	$(AR) $(ARFLAGS) [email protected] $(MODOBJS)
  	$(RANLIB) [email protected]
  
@@ -1067,7 +1067,7 @@
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
  		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
  		$(LN) -f $(INSTSONAME) [email protected]; \
[email protected]@ -580,9 +587,8 @@
[email protected]@ -595,9 +602,8 @@
  libpython3.so:	libpython$(LDVERSION).so
  	$(BLDSHARED) $(NO_AS_NEEDED) -o [email protected] -Wl,[email protected] $^
  
@@ -1079,7 +1079,7 @@
  
  libpython$(VERSION).sl: $(LIBRARY_OBJS)
  	$(LDSHARED) -o [email protected] $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST)
[email protected]@ -682,12 +688,18 @@
[email protected]@ -697,12 +703,18 @@
  		$(MODULE_OBJS) \
  		$(SIGNAL_OBJS) \
  		$(MODOBJS) \
@@ -1098,7 +1098,7 @@
  
  Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
  	$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
[email protected]@ -820,6 +832,46 @@
[email protected]@ -835,6 +847,46 @@
  Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
  	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
  
@@ -1145,7 +1145,7 @@
  ############################################################################
  # Header files
  
[email protected]@ -1516,6 +1568,11 @@
[email protected]@ -1531,6 +1583,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]@ -1547,6 +1604,11 @@
[email protected]@ -1562,6 +1619,11 @@
  				     -o -name '*.orig' -o -name '*.rej' \
  				     -o -name '*.bak' ')' \
  				     -exec rm -f {} ';'
@@ -1480,8 +1480,8 @@
      PyTypeObject *type, *base;
      destructor basedealloc;
      PyThreadState *tstate = PyThreadState_GET();
---- Python-3.4.0/Python/ceval.c
-+++ Python-3.4.0/Python/ceval.c
+--- Python-3.4.2/Python/ceval.c.~1~	2014-09-22 05:57:05.000000000 -0700
++++ Python-3.4.2/Python/ceval.c	2014-09-22 11:50:27.740913482 -0700
 @@ -18,6 +18,13 @@
  
  #include <ctype.h>
@@ -1606,7 +1606,7 @@
      co = f->f_code;
      names = co->co_names;
      consts = co->co_consts;
[email protected]@ -1343,6 +1412,12 @@
[email protected]@ -1350,6 +1419,12 @@
          /* Main switch on opcode */
          READ_TIMESTAMP(inst0);
  
@@ -1619,7 +1619,7 @@
          switch (opcode) {
  
          /* BEWARE!
[email protected]@ -3216,6 +3291,10 @@
[email protected]@ -3223,6 +3298,10 @@
  
      /* pop frame */
  exit_eval_frame:
@@ -1630,7 +1630,7 @@
      Py_LeaveRecursiveCall();
      f->f_executing = 0;
      tstate->frame = f->f_back;
[email protected]@ -3915,6 +3994,57 @@
[email protected]@ -3922,6 +4001,57 @@
      return result;
  }
  
@@ -1688,7 +1688,7 @@
  PyObject *
  _PyEval_CallTracing(PyObject *func, PyObject *args)
  {
[email protected]@ -3932,6 +4062,51 @@
[email protected]@ -3939,6 +4069,51 @@
      return result;
  }
  
@@ -1740,8 +1740,8 @@
  /* See Objects/lnotab_notes.txt for a description of how tracing works. */
  static int
  maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
---- Python-3.4.0/configure
-+++ Python-3.4.0/configure
+--- Python-3.4.2/configure.~1~	2014-09-22 05:57:05.000000000 -0700
++++ Python-3.4.2/configure	2014-09-22 12:48:32.849088475 -0700
 @@ -642,6 +642,11 @@
  MACHDEP_OBJS
  DYNLOADFILE
@@ -1754,7 +1754,7 @@
  THREADOBJ
  LDLAST
  USE_THREAD_MODULE
[email protected]@ -811,6 +816,7 @@
[email protected]@ -812,6 +817,7 @@
  with_tsc
  with_pymalloc
  with_valgrind
@@ -1762,7 +1762,7 @@
  with_fpectl
  with_libm
  with_libc
[email protected]@ -1494,6 +1500,7 @@
[email protected]@ -1495,6 +1501,7 @@
    --with(out)-tsc         enable/disable timestamp counter profile
    --with(out)-pymalloc    disable/enable specialized mallocs
    --with-valgrind         Enable Valgrind support
@@ -1770,7 +1770,7 @@
    --with-fpectl           enable SIGFPE catching
    --with-libm=STRING      math library
    --with-libc=STRING      C library
[email protected]@ -10368,6 +10375,174 @@
[email protected]@ -10386,6 +10393,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.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 @@
+--- Python-3.4.2/configure.ac.~1~	2014-09-22 05:57:05.000000000 -0700
++++ Python-3.4.2/configure.ac	2014-09-22 12:51:15.173895356 -0700
[email protected]@ -2874,6 +2874,62 @@
      OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT"
  fi
  
@@ -2022,9 +2022,9 @@
  /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) dynamic
     linker (dyld) instead of the old-style (NextStep) dynamic linker (rld).
     Dyld is necessary to support frameworks. */
---- Python-3.4.0/setup.py
-+++ Python-3.4.0/setup.py
[email protected]@ -637,6 +637,9 @@
+--- Python-3.4.2/setup.py.~1~	2014-09-22 05:57:05.000000000 -0700
++++ Python-3.4.2/setup.py	2014-09-22 12:56:08.602474892 -0700
[email protected]@ -643,6 +643,9 @@
          # syslog daemon interface
          exts.append( Extension('syslog', ['syslogmodule.c']) )
  
--- a/components/python/python34/patches/01-bits.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/01-bits.patch	Wed Oct 29 14:12:28 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.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
+--- Python-3.4.2/configure.ac.~2~	2014-09-22 12:56:55.683506632 -0700
++++ Python-3.4.2/configure.ac	2014-09-22 12:56:55.695790952 -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]@ -2097,12 +2097,6 @@
[email protected]@ -2114,12 +2114,6 @@
  if test -z "$CCSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
--- a/components/python/python34/patches/03-setup.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/03-setup.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -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-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
[email protected]@ -728,6 +728,13 @@
+--- Python-3.4.2/setup.py.~2~	2014-09-22 12:58:20.756337175 -0700
++++ Python-3.4.2/setup.py	2014-09-22 12:58:20.806201115 -0700
[email protected]@ -736,6 +736,13 @@
                                                       ['/usr/lib/termcap'],
                                                       'termcap'):
                  readline_libs.append('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]@ -1910,7 +1917,7 @@
[email protected]@ -1918,7 +1925,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	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/05-studio-profile.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -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-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
[email protected]@ -472,30 +472,39 @@
+--- Python-3.4.2/Makefile.pre.in.~2~	2014-09-22 14:03:21.153426271 -0700
++++ Python-3.4.2/Makefile.pre.in	2014-09-22 14:03:21.234552368 -0700
[email protected]@ -477,30 +477,39 @@
  profile-opt:
  	@echo "Building with support for profile generation:"
  	$(MAKE) clean
@@ -51,7 +51,7 @@
  
  coverage-lcov:
  	@echo "Creating Coverage HTML report with LCOV:"
[email protected]@ -556,13 +565,9 @@
[email protected]@ -571,13 +580,9 @@
  # -s, --silent or --quiet is always the first char.
  # Under BSD make, MAKEFLAGS might be " -s -v x=y".
  sharedmods: $(BUILDPYTHON) pybuilddir.txt
@@ -66,7 +66,7 @@
  
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
[email protected]@ -1576,7 +1581,7 @@
[email protected]@ -1591,7 +1596,7 @@
  	-rm -f Modules/_testembed Modules/_freeze_importlib
  
  profile-removal:
--- a/components/python/python34/patches/06-solaris-64-bit.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/06-solaris-64-bit.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -4,9 +4,9 @@
 tests that fail due to this patch.  As the patch is Solaris-specific, it is
 not suitable for upstream.
 
---- Python-3.4.1/Lib/distutils/command/build_ext.py.~1~	2014-05-18 22:19:37.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/command/build_ext.py	2014-08-05 16:07:07.494400637 -0700
[email protected]@ -668,6 +668,9 @@
+--- Python-3.4.2/Lib/distutils/command/build_ext.py.~1~	2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/command/build_ext.py	2014-09-22 14:05:09.231795935 -0700
[email protected]@ -659,6 +659,9 @@
          ext_suffix = get_config_var('EXT_SUFFIX')
          if os.name == 'nt' and self.debug:
              return os.path.join(*ext_path) + '_d' + ext_suffix
@@ -16,9 +16,9 @@
          return os.path.join(*ext_path) + ext_suffix
  
      def get_export_symbols(self, ext):
---- Python-3.4.1/Lib/distutils/tests/test_build_ext.py.~1~	2014-05-18 22:19:38.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/tests/test_build_ext.py	2014-08-05 15:28:29.067709834 -0700
[email protected]@ -317,7 +317,8 @@
+--- Python-3.4.2/Lib/distutils/tests/test_build_ext.py.~1~	2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/tests/test_build_ext.py	2014-09-22 14:08:54.798141164 -0700
[email protected]@ -315,7 +315,8 @@
          ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
          self.assertTrue(so_file.endswith(ext_suffix))
          so_dir = os.path.dirname(so_file)
@@ -28,7 +28,7 @@
  
          cmd.inplace = 0
          cmd.compiler = None
[email protected]@ -326,7 +327,8 @@
[email protected]@ -324,7 +325,8 @@
          self.assertTrue(os.path.exists(so_file))
          self.assertTrue(so_file.endswith(ext_suffix))
          so_dir = os.path.dirname(so_file)
@@ -38,7 +38,7 @@
  
          # inplace = 0, cmd.package = 'bar'
          build_py = cmd.get_finalized_command('build_py')
[email protected]@ -334,7 +336,8 @@
[email protected]@ -332,7 +334,8 @@
          path = cmd.get_ext_fullpath('foo')
          # checking that the last directory is the build_dir
          path = os.path.split(path)[0]
@@ -48,7 +48,7 @@
  
          # inplace = 1, cmd.package = 'bar'
          cmd.inplace = 1
[email protected]@ -348,7 +351,8 @@
[email protected]@ -346,7 +349,8 @@
          # checking that the last directory is bar
          path = os.path.split(path)[0]
          lastdir = os.path.split(path)[-1]
@@ -58,7 +58,7 @@
  
      def test_ext_fullpath(self):
          ext = sysconfig.get_config_var('EXT_SUFFIX')
[email protected]@ -364,14 +368,16 @@
[email protected]@ -362,14 +366,16 @@
          curdir = os.getcwd()
          wanted = os.path.join(curdir, 'src', 'lxml', 'etree' + ext)
          path = cmd.get_ext_fullpath('lxml.etree')
@@ -77,7 +77,7 @@
  
          # building twisted.runner.portmap not inplace
          build_py = cmd.get_finalized_command('build_py')
[email protected]@ -380,13 +386,15 @@
[email protected]@ -378,13 +384,15 @@
          path = cmd.get_ext_fullpath('twisted.runner.portmap')
          wanted = os.path.join(curdir, 'tmpdir', 'twisted', 'runner',
                                'portmap' + ext)
@@ -95,15 +95,15 @@
  
  
      @unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for MacOSX')
---- Python-3.4.1/Lib/distutils/tests/test_sysconfig.py.~1~	2014-05-18 22:19:38.000000000 -0700
-+++ Python-3.4.1/Lib/distutils/tests/test_sysconfig.py	2014-08-05 13:11:56.906745265 -0700
+--- Python-3.4.2/Lib/distutils/tests/test_sysconfig.py.~1~	2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/tests/test_sysconfig.py	2014-09-22 14:10:18.427824361 -0700
 @@ -1,4 +1,5 @@
  """Tests for distutils.sysconfig."""
 +import sys
  import os
  import shutil
- import unittest
[email protected]@ -124,6 +125,8 @@
+ import subprocess
[email protected]@ -127,6 +128,8 @@
  
      def test_sysconfig_module(self):
          import sysconfig as global_sysconfig
@@ -112,7 +112,7 @@
          self.assertEqual(global_sysconfig.get_config_var('CFLAGS'),
                           sysconfig.get_config_var('CFLAGS'))
          self.assertEqual(global_sysconfig.get_config_var('LDFLAGS'),
[email protected]@ -149,8 +152,9 @@
[email protected]@ -152,8 +155,9 @@
          import sysconfig as global_sysconfig
          if sysconfig.get_config_var('CUSTOMIZED_OSX_COMPILER'):
              self.skipTest('compiler flags customized')
--- a/components/python/python34/patches/07-ucred.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/07-ucred.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -410,9 +410,9 @@
 +
 +	return m;
 +}
---- 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 @@
+--- Python-3.4.2/setup.py.~3~	2014-09-22 14:12:32.357526710 -0700
++++ Python-3.4.2/setup.py	2014-09-22 14:12:32.421969305 -0700
[email protected]@ -1485,6 +1485,13 @@
          # Stefan Krah's _decimal module
          exts.append(self._decimal_ext())
  
--- a/components/python/python34/patches/08-dlpi.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/08-dlpi.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1223,9 +1223,9 @@
 +
 +	return mod;
 +}
---- 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 @@
+--- Python-3.4.2/setup.py.~4~	2014-09-22 14:13:40.664675485 -0700
++++ Python-3.4.2/setup.py	2014-09-22 14:13:40.683389017 -0700
[email protected]@ -1492,6 +1492,12 @@
              exts.append( Extension('ucred', ['ucred.c'],
                                     libraries = ['tsol']) )
  
@@ -1238,8 +1238,6 @@
          # Thomas Heller's _ctypes module
          self.detect_ctypes(inc_dirs, lib_dirs)
  
-diff --git Python-2.6.4/lib/test/dlpitest.py Python-2.6.4/Lib/test/dlpitest.py
-new file mode 100644
 --- /dev/null	2011-02-12 03:13:26.000000000 -0600
 +++ Python-2.6.4/Lib/test/dlpitest.py	2011-01-20 13:52:42.895865414 -0600
 @@ -0,0 +1,96 @@
--- a/components/python/python34/patches/10-rbac.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/10-rbac.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1283,9 +1283,9 @@
 +	0,                            /* tp_free */
 +	0,                            /* tp_is_gc */
 +};
---- 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 @@
+--- Python-3.4.2/setup.py.~5~	2014-09-22 14:15:00.047444289 -0700
++++ Python-3.4.2/setup.py	2014-09-22 14:15:00.082157199 -0700
[email protected]@ -1498,6 +1498,22 @@
              exts.append( Extension('dlpi', ['dlpimodule.c'],
                                     libraries = ['dlpi']) )
  
--- a/components/python/python34/patches/12-py_db.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/12-py_db.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -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-3.4.0/Makefile.pre.in.~3~	2014-03-19 10:48:24.881429192 -0700
-+++ Python-3.4.0/Makefile.pre.in	2014-03-19 10:48:25.069002130 -0700
[email protected]@ -466,7 +466,7 @@
+--- Python-3.4.2/Makefile.pre.in.~3~	2014-09-22 14:16:07.846210795 -0700
++++ Python-3.4.2/Makefile.pre.in	2014-09-22 14:16:07.961725537 -0700
[email protected]@ -471,7 +471,7 @@
  
  # Default target
  all:		build_all
@@ -12,7 +12,7 @@
  
  # Compile a binary with gcc profile guided optimization.
  profile-opt:
[email protected]@ -658,6 +658,19 @@
[email protected]@ -673,6 +673,19 @@
  	@mv config.c Modules
  	@echo "The Makefile was updated, you may need to re-run make."
  
@@ -32,7 +32,7 @@
  
  Modules/Setup: $(srcdir)/Modules/Setup.dist
  	@if test -f Modules/Setup; then \
[email protected]@ -1027,7 +1040,7 @@
[email protected]@ -1042,7 +1055,7 @@
  		$(TESTRUNNER) $(QUICKTESTOPTS)
  
  
--- a/components/python/python34/patches/14-ossaudiodev.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/14-ossaudiodev.patch	Wed Oct 29 14:12:28 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.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 @@
+--- Python-3.4.2/setup.py.~6~	2014-09-22 14:17:20.562920233 -0700
++++ Python-3.4.2/setup.py	2014-09-22 14:17:20.631967980 -0700
[email protected]@ -1569,7 +1569,7 @@
          # End multiprocessing
  
          # Platform-specific libraries
--- a/components/python/python34/patches/15-include.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/15-include.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1,14 +1,14 @@
 On Solaris pyconfig.h is delivered in the normal python header directory.
 As this is Solaris-specific, it is not suitable for upstream.
 
---- Python-3.4.0/Lib/distutils/sysconfig.py.~1~	2014-03-16 19:31:29.000000000 -0700
-+++ Python-3.4.0/Lib/distutils/sysconfig.py	2014-03-17 13:50:16.261084406 -0700
[email protected]@ -242,7 +242,7 @@
+--- Python-3.4.2/Lib/distutils/sysconfig.py.~1~	2014-09-22 05:56:59.000000000 -0700
++++ Python-3.4.2/Lib/distutils/sysconfig.py	2014-09-22 14:20:16.045987560 -0700
[email protected]@ -240,7 +240,7 @@
          else:
              inc_dir = _sys_home or project_base
      else:
 -        inc_dir = get_python_inc(plat_specific=1)
 +        inc_dir = get_python_inc(plat_specific=0)
-     if get_python_version() < '2.2':
-         config_h = 'config.h'
-     else:
+ 
+     return os.path.join(inc_dir, 'pyconfig.h')
+ 
--- a/components/python/python34/patches/16-pic-compile.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/16-pic-compile.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1,8 +1,8 @@
 This patch is a Solaris-specific hack; it will not be submitted upstream.
 
---- Python-3.4.0/Lib/distutils/sysconfig.py.~2~	2014-04-30 09:23:26.632873134 -0700
-+++ Python-3.4.0/Lib/distutils/sysconfig.py	2014-04-30 10:49:42.395635789 -0700
[email protected]@ -221,6 +221,22 @@
+--- Python-3.4.2/Lib/distutils/sysconfig.py.~2~	2014-09-22 14:20:53.466326587 -0700
++++ Python-3.4.2/Lib/distutils/sysconfig.py	2014-09-22 14:20:53.494063421 -0700
[email protected]@ -219,6 +219,22 @@
          else:
              archiver = ar + ' ' + ar_flags
  
--- a/components/python/python34/patches/18-pymalloc.patch	Wed Oct 29 08:04:59 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-This patch comes from upstream; it will likely no longer be needed whenever
-Python 3.4.2 becomes available.
-
-# HG changeset patch
-# Parent 7fafbb7e1a8fbcb8875e25d8cd07273069127556
-Issue #21166: Prevent possible segfaults and other random failures of
-python --generate-posix-vars in pybuilddir.txt build target by ensuring
-that pybuilddir.txt is always regenerated when configure is run and
-that the newly built skeleton python does not inadvertently import
-modules from previously installed instances.
-
---- Python-3.4.1/Makefile.pre.in	Mon Aug 11 15:01:28 2014 -0500
-+++ Python-3.4.1/Makefile.pre.in	Mon Aug 11 18:16:56 2014 -0700
[email protected]@ -557,8 +557,18 @@
- # Create build directory and generate the sysconfig build-time data there.
- # pybuilddir.txt contains the name of the build dir and is used for
- # sys.path fixup -- see Modules/getpath.c.
-+# Since this step runs before shared modules are built, try to avoid bootstrap
-+# problems by creating a dummy pybuildstr.txt just to allow interpreter
-+# initialization to succeed.  It will be overwritten by generate-posix-vars
-+# or removed in case of failure.
- pybuilddir.txt: $(BUILDPYTHON)
--	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+	@echo "none" > ./pybuilddir.txt
-+	$(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\
-+	if test $$? -ne 0 ; then \
-+		echo "generate-posix-vars failed" ; \
-+		rm -f ./pybuilddir.txt ; \
-+		exit 1 ; \
-+	fi
- 
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
---- Python-3.4.1/configure.ac	Mon Aug 11 15:01:28 2014 -0500
-+++ Python-3.4.1/configure.ac	Mon Aug 11 18:16:56 2014 -0700
[email protected]@ -53,6 +53,9 @@
- AC_SUBST(build)
- AC_SUBST(host)
- 
-+# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
-+rm -f pybuilddir.txt
-+
- if test "$cross_compiling" = yes; then
-     AC_MSG_CHECKING([for python interpreter for cross build])
-     if test -z "$PYTHON_FOR_BUILD"; then
--- a/components/python/python34/patches/19-SOABI.patch	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/patches/19-SOABI.patch	Wed Oct 29 14:12:28 2014 -0700
@@ -1,9 +1,9 @@
 This patch was developed in-house.  We have not yet decided whether to offer
 it upstream or not.
 
---- Python-3.4.1/configure.ac.~4~	2014-08-19 14:56:06.370409509 -0700
-+++ Python-3.4.1/configure.ac	2014-08-19 14:56:45.423571774 -0700
[email protected]@ -4129,7 +4129,7 @@
+--- Python-3.4.2/configure.ac.~3~	2014-09-22 14:35:47.865240136 -0700
++++ Python-3.4.2/configure.ac	2014-09-22 14:35:48.074504467 -0700
[email protected]@ -4143,7 +4143,7 @@
  
  AC_SUBST(EXT_SUFFIX)
  case $ac_sys_system in
--- a/components/python/python34/python-34.p5m	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/python-34.p5m	Wed Oct 29 14:12:28 2014 -0700
@@ -195,6 +195,7 @@
 file path=usr/lib/python3.4/asyncio/base_events.py
 file path=usr/lib/python3.4/asyncio/base_subprocess.py
 file path=usr/lib/python3.4/asyncio/constants.py
+file path=usr/lib/python3.4/asyncio/coroutines.py
 file path=usr/lib/python3.4/asyncio/events.py
 file path=usr/lib/python3.4/asyncio/futures.py
 file path=usr/lib/python3.4/asyncio/locks.py
@@ -264,7 +265,7 @@
 file path=usr/lib/python3.4/ctypes/macholib/framework.py
 #
 file path=usr/lib/python3.4/ctypes/test/__init__.py
-file path=usr/lib/python3.4/ctypes/test/runtests.py
+file path=usr/lib/python3.4/ctypes/test/__main__.py
 file path=usr/lib/python3.4/ctypes/test/test_anon.py
 file path=usr/lib/python3.4/ctypes/test/test_array_in_pointer.py
 file path=usr/lib/python3.4/ctypes/test/test_arrays.py
@@ -278,7 +279,6 @@
 file path=usr/lib/python3.4/ctypes/test/test_cfuncs.py
 file path=usr/lib/python3.4/ctypes/test/test_checkretval.py
 file path=usr/lib/python3.4/ctypes/test/test_delattr.py
-file path=usr/lib/python3.4/ctypes/test/test_errcheck.py
 file path=usr/lib/python3.4/ctypes/test/test_errno.py
 file path=usr/lib/python3.4/ctypes/test/test_find.py
 file path=usr/lib/python3.4/ctypes/test/test_frombuffer.py
@@ -286,7 +286,6 @@
 file path=usr/lib/python3.4/ctypes/test/test_functions.py
 file path=usr/lib/python3.4/ctypes/test/test_incomplete.py
 file path=usr/lib/python3.4/ctypes/test/test_init.py
-file path=usr/lib/python3.4/ctypes/test/test_integers.py
 file path=usr/lib/python3.4/ctypes/test/test_internals.py
 file path=usr/lib/python3.4/ctypes/test/test_keeprefs.py
 file path=usr/lib/python3.4/ctypes/test/test_libc.py
@@ -706,17 +705,25 @@
 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_autocomplete.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_autoexpand.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_calltips.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_config_name.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_configdialog.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_delegator.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_formatparagraph.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_grep.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_hyperparser.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_idlehistory.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_parenmatch.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_pathbrowser.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_rstrip.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_searchdialogbase.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_searchengine.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_text.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_textview.py
 file path=usr/lib/python3.4/idlelib/idle_test/test_warning.py
+file path=usr/lib/python3.4/idlelib/idle_test/test_widgetredir.py
 file path=usr/lib/python3.4/idlelib/idlever.py
 file path=usr/lib/python3.4/idlelib/keybindingDialog.py
 file path=usr/lib/python3.4/idlelib/macosxSupport.py
@@ -1145,6 +1152,7 @@
 file path=usr/lib/python3.4/test/cjkencodings/shift_jisx0213-utf8.txt
 file path=usr/lib/python3.4/test/cjkencodings/shift_jisx0213.txt
 file path=usr/lib/python3.4/test/cmath_testcases.txt
+file path=usr/lib/python3.4/test/coding20731.py
 file path=usr/lib/python3.4/test/curses_tests.py
 file path=usr/lib/python3.4/test/data/README
 file path=usr/lib/python3.4/test/datetimetester.py
@@ -1653,19 +1661,23 @@
 file path=usr/lib/python3.4/test/test_importlib/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/abc.py
 file path=usr/lib/python3.4/test/test_importlib/builtin/__init__.py
+file path=usr/lib/python3.4/test/test_importlib/builtin/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/builtin/test_finder.py
 file path=usr/lib/python3.4/test/test_importlib/builtin/test_loader.py
 file path=usr/lib/python3.4/test/test_importlib/builtin/util.py
 file path=usr/lib/python3.4/test/test_importlib/extension/__init__.py
+file path=usr/lib/python3.4/test/test_importlib/extension/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/extension/test_case_sensitivity.py
 file path=usr/lib/python3.4/test/test_importlib/extension/test_finder.py
 file path=usr/lib/python3.4/test/test_importlib/extension/test_loader.py
 file path=usr/lib/python3.4/test/test_importlib/extension/test_path_hook.py
 file path=usr/lib/python3.4/test/test_importlib/extension/util.py
 file path=usr/lib/python3.4/test/test_importlib/frozen/__init__.py
+file path=usr/lib/python3.4/test/test_importlib/frozen/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/frozen/test_finder.py
 file path=usr/lib/python3.4/test/test_importlib/frozen/test_loader.py
 file path=usr/lib/python3.4/test/test_importlib/import_/__init__.py
+file path=usr/lib/python3.4/test/test_importlib/import_/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/import_/test___loader__.py
 file path=usr/lib/python3.4/test/test_importlib/import_/test___package__.py
 file path=usr/lib/python3.4/test/test_importlib/import_/test_api.py
@@ -1692,6 +1704,7 @@
 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/__main__.py
 file path=usr/lib/python3.4/test/test_importlib/source/test_case_sensitivity.py
 file path=usr/lib/python3.4/test/test_importlib/source/test_file_loader.py
 file path=usr/lib/python3.4/test/test_importlib/source/test_finder.py
@@ -1856,6 +1869,7 @@
 file path=usr/lib/python3.4/test/test_socketserver.py
 file path=usr/lib/python3.4/test/test_sort.py
 file path=usr/lib/python3.4/test/test_source_encoding.py
+file path=usr/lib/python3.4/test/test_spwd.py
 file path=usr/lib/python3.4/test/test_sqlite.py
 file path=usr/lib/python3.4/test/test_ssl.py
 file path=usr/lib/python3.4/test/test_startfile.py
@@ -1898,7 +1912,6 @@
 file path=usr/lib/python3.4/test/test_timeout.py
 file path=usr/lib/python3.4/test/test_tk.py
 file path=usr/lib/python3.4/test/test_tokenize.py
-file path=usr/lib/python3.4/test/test_tools.py
 file path=usr/lib/python3.4/test/test_trace.py
 file path=usr/lib/python3.4/test/test_traceback.py
 file path=usr/lib/python3.4/test/test_tracemalloc.py
@@ -1977,23 +1990,6 @@
 file path=usr/lib/python3.4/this.py
 file path=usr/lib/python3.4/threading.py
 file path=usr/lib/python3.4/timeit.py
-file path=usr/lib/python3.4/tkinter/test/README
-file path=usr/lib/python3.4/tkinter/test/__init__.py
-file path=usr/lib/python3.4/tkinter/test/runtktests.py
-file path=usr/lib/python3.4/tkinter/test/support.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/__init__.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_font.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_loadtk.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_misc.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_text.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_variables.py
-file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_widgets.py
-file path=usr/lib/python3.4/tkinter/test/test_ttk/__init__.py
-file path=usr/lib/python3.4/tkinter/test/test_ttk/test_extensions.py
-file path=usr/lib/python3.4/tkinter/test/test_ttk/test_functions.py
-file path=usr/lib/python3.4/tkinter/test/test_ttk/test_style.py
-file path=usr/lib/python3.4/tkinter/test/test_ttk/test_widgets.py
-file path=usr/lib/python3.4/tkinter/test/widget_tests.py
 file path=usr/lib/python3.4/token.py
 file path=usr/lib/python3.4/tokenize.py
 file path=usr/lib/python3.4/trace.py pkg.depend.bypass-generate=.*
@@ -2003,13 +1999,10 @@
 file path=usr/lib/python3.4/turtle.py
 file path=usr/lib/python3.4/turtledemo/__init__.py
 file path=usr/lib/python3.4/turtledemo/__main__.py
-file path=usr/lib/python3.4/turtledemo/about_turtle.txt
-file path=usr/lib/python3.4/turtledemo/about_turtledemo.txt
 file path=usr/lib/python3.4/turtledemo/bytedesign.py
 file path=usr/lib/python3.4/turtledemo/chaos.py
 file path=usr/lib/python3.4/turtledemo/clock.py
 file path=usr/lib/python3.4/turtledemo/colormixer.py
-file path=usr/lib/python3.4/turtledemo/demohelp.txt
 file path=usr/lib/python3.4/turtledemo/forest.py
 file path=usr/lib/python3.4/turtledemo/fractalcurves.py
 file path=usr/lib/python3.4/turtledemo/lindenmayer.py
--- a/components/python/python34/python34.license	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/python34.license	Wed Oct 29 14:12:28 2014 -0700
@@ -1,51 +1,57 @@
-Terms and conditions for accessing or otherwise using Python
-============================================================
+From the LICENSE file:
 
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
 
-.. centered:: PSF LICENSE AGREEMENT FOR PYTHON |release|
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
 
-#. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
-   the Individual or Organization ("Licensee") accessing and otherwise using Python
-   |release| software in source or binary form and its associated documentation.
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
 
-#. Subject to the terms and conditions of this License Agreement, PSF hereby
-   grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
-   analyze, test, perform and/or display publicly, prepare derivative works,
-   distribute, and otherwise use Python |release| alone or in any derivative
-   version, provided, however, that PSF's License Agreement and PSF's notice of
-   copyright, i.e., "Copyright © 2001-2010 Python Software Foundation; All Rights
-   Reserved" are retained in Python |release| alone or in any derivative version
-   prepared by Licensee.
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are
+retained in Python alone or in any derivative version prepared by Licensee.
 
-#. In the event Licensee prepares a derivative work that is based on or
-   incorporates Python |release| or any part thereof, and wants to make the
-   derivative work available to others as provided herein, then Licensee hereby
-   agrees to include in any such work a brief summary of the changes made to Python
-   |release|.
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
 
-#. PSF is making Python |release| available to Licensee on an "AS IS" basis.
-   PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.  BY WAY OF
-   EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
-   WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-   USE OF PYTHON |release| WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
 
-#. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |release|
-   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
-   MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON |release|, OR ANY DERIVATIVE
-   THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
-#. This License Agreement will automatically terminate upon a material breach of
-   its terms and conditions.
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
 
-#. Nothing in this License Agreement shall be deemed to create any relationship
-   of agency, partnership, or joint venture between PSF and Licensee.  This License
-   Agreement does not grant permission to use PSF trademarks or trade name in a
-   trademark sense to endorse or promote products or services of Licensee, or any
-   third party.
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
 
-#. By copying, installing or otherwise using Python |release|, Licensee agrees
-   to be bound by the terms and conditions of this License Agreement.
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
 
+From the Doc/license.rst file:
 
 Licenses and Acknowledgements for Incorporated Software
 =======================================================
@@ -58,7 +64,7 @@
 ----------------
 
 The :mod:`_random` module includes code based on a download from
-http://www.math.keio.ac.jp/ matumoto/MT2002/emt19937ar.html. The following are
+http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html. The following are
 the verbatim comments from the original code::
 
    A C-program for MT19937, with initialization improved 2002/1/26.
@@ -99,8 +105,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: [email protected]
+   http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html
+   email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space)
 
 
 Sockets
@@ -180,56 +186,6 @@
      ---------------------------------------------------------------------
 
 
-MD5 message digest algorithm
-----------------------------
-
-The source code for the :mod:`md5` module contains the following notice::
-
-     Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-     This software is provided 'as-is', without any express or implied
-     warranty.  In no event will the authors be held liable for any damages
-     arising from the use of this software.
-
-     Permission is granted to anyone to use this software for any purpose,
-     including commercial applications, and to alter it and redistribute it
-     freely, subject to the following restrictions:
-
-     1. The origin of this software must not be misrepresented; you must not
-        claim that you wrote the original software. If you use this software
-        in a product, an acknowledgment in the product documentation would be
-        appreciated but is not required.
-     2. Altered source versions must be plainly marked as such, and must not be
-        misrepresented as being the original software.
-     3. This notice may not be removed or altered from any source distribution.
-
-     L. Peter Deutsch
-     [email protected]
-
-     Independent implementation of MD5 (RFC 1321).
-
-     This code implements the MD5 Algorithm defined in RFC 1321, whose
-     text is available at
-           http://www.ietf.org/rfc/rfc1321.txt
-     The code is derived from the text of the RFC, including the test suite
-     (section A.5) but excluding the rest of Appendix A.  It does not include
-     any code or documentation that is identified in the RFC as being
-     copyrighted.
-
-     The original and principal author of md5.h is L. Peter Deutsch
-     <[email protected]>.  Other authors are noted in the change history
-     that follows (in reverse chronological order):
-
-     2002-04-13 lpd Removed support for non-ANSI compilers; removed
-           references to Ghostscript; clarified derivation from RFC 1321;
-           now handles byte order either statically or dynamically.
-     1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-     1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-           added conditionalization for C++ compilation from Martin
-           Purschke <[email protected]>.
-     1999-05-03 lpd Original version.
-
-
 Asynchronous socket services
 ----------------------------
 
@@ -260,7 +216,7 @@
 Cookie management
 -----------------
 
-The :mod:`Cookie` module contains the following notice::
+The :mod:`http.cookies` module contains the following notice::
 
    Copyright 2000 by Timothy O'Malley <[email protected]>
 
@@ -351,7 +307,7 @@
 XML Remote Procedure Calls
 --------------------------
 
-The :mod:`xmlrpclib` module contains the following notice::
+The :mod:`xmlrpc.client` module contains the following notice::
 
        The XML-RPC client interface is
 
@@ -435,3 +391,937 @@
   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
+
+
+SipHash24
+---------
+
+The file :file:`Python/pyhash.c` contains Marek Majkowski' implementation of
+Dan Bernstein's SipHash24 algorithm. The contains the following note::
+
+  <MIT License>
+  Copyright (c) 2013  Marek Majkowski <[email protected]>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  </MIT License>
+
+  Original location:
+     https://github.com/majek/csiphash/
+
+  Solution inspired by code from:
+     Samuel Neves (supercop/crypto_auth/siphash24/little)
+     djb (supercop/crypto_auth/siphash24/little2)
+     Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
+
+
+strtod and dtoa
+---------------
+
+The file :file:`Python/dtoa.c`, which supplies C functions dtoa and
+strtod for conversion of C doubles to and from strings, is derived
+from the file of the same name by David M. Gay, currently available
+from http://www.netlib.org/fp/.  The original file, as retrieved on
+March 16, 2009, contains the following copyright and licensing
+notice::
+
+   /****************************************************************
+    *
+    * The author of this software is David M. Gay.
+    *
+    * Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+    *
+    * Permission to use, copy, modify, and distribute this software for any
+    * purpose without fee is hereby granted, provided that this entire notice
+    * is included in all copies of any software which is or includes a copy
+    * or modification of this software and in all copies of the supporting
+    * documentation for such software.
+    *
+    * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+    * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+    * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+    * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+    *
+    ***************************************************************/
+
+
+expat
+-----
+
+The :mod:`pyexpat` extension is built using an included copy of the expat
+sources unless the build is configured ``--with-system-expat``::
+
+  Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+                                 and Clark Cooper
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+libffi
+------
+
+The :mod:`_ctypes` extension is built using an included copy of the libffi
+sources unless the build is configured ``--with-system-libffi``::
+
+   Copyright (c) 1996-2008  Red Hat, Inc and others.
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+   DEALINGS IN THE SOFTWARE.
+
+
+zlib
+----
+
+The :mod:`zlib` extension is built using an included copy of the zlib
+sources if the zlib version found on the system is too old to be
+used for the build::
+
+  Copyright (C) 1995-2011 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  [email protected]          [email protected]
+
+
+cfuhash
+-------
+
+The implementation of the hash table used by the :mod:`tracemalloc` is based
+on the cfuhash project::
+
+   Copyright (c) 2005 Don Owens
+   All rights reserved.
+
+   This code is released under the BSD license:
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+     * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+
+     * Neither the name of the author nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+   COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+   OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+libmpdec
+--------
+
+The :mod:`_decimal` Module is built using an included copy of the libmpdec
+library unless the build is configured ``--with-system-libmpdec``::
+
+   Copyright (c) 2008-2016 Stefan Krah. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
+---------------------------------------------------------------------------
+
+Additional attribution text found in the source:
+
+::::::::::::::
+Lib/bsddb/__init__.py
+::::::::::::::
+#  Copyright (c) 1999-2001, Digital Creations, Fredericksburg, VA, USA
+#  and Andrew Kuchling. All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are
+#  met:
+#
+#    o Redistributions of source code must retain the above copyright
+#      notice, this list of conditions, and the disclaimer that follows.
+#
+#    o Redistributions in binary form must reproduce the above copyright
+#      notice, this list of conditions, and the following disclaimer in
+#      the documentation and/or other materials provided with the
+#      distribution.
+#
+#    o Neither the name of Digital Creations nor the names of its
+#      contributors may be used to endorse or promote products derived
+#      from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS AND CONTRIBUTORS *AS
+#  IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+#  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+#  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL
+#  CREATIONS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+#  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+#  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+#  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+#  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+#  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+#  DAMAGE.
+::::::::::::::
+Lib/compiler/transformer.py
+::::::::::::::
+# Original version written by Greg Stein ([email protected])
+#                         and Bill Tutt ([email protected])
+# February 1997.
+#
+# Modifications and improvements for Python 2.0 by Jeremy Hylton and
+# Mark Hammond
+#
+# Some fixes to try to have correct line number on almost all nodes
+# (except Module, Discard and Stmt) added by Sylvain Thenault
+#
+# Portions of this file are:
+# Copyright (C) 1997-1998 Greg Stein. All Rights Reserved.
+#
+# This module is provided under a BSD-ish license. See
+#   http://www.opensource.org/licenses/bsd-license.html
+# and replace OWNER, ORGANIZATION, and YEAR as appropriate.
+::::::::::::::
+Lib/lib-tk/turtle.py
+::::::::::::::
+# Copyright (C) 2006 - 2010  Gregor Lingl
+# email: [email protected]
+#
+# This software is provided 'as-is', without any express or implied
+# warranty.  In no event will the authors be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+::::::::::::::
+Lib/logging/__init__.py
+::::::::::::::
+# Copyright 2001-2009 by Vinay Sajip. All Rights Reserved.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose and without fee is hereby granted,
+# provided that the above copyright notice appear in all copies and that
+# both that copyright notice and this permission notice appear in
+# supporting documentation, and that the name of Vinay Sajip
+# not be used in advertising or publicity pertaining to distribution
+# of the software without specific, written prior permission.
+# VINAY SAJIP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+# ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# VINAY SAJIP BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+# ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+::::::::::::::
+Lib/multiprocessing/__init__.py
+::::::::::::::
+# Copyright (c) 2006-2008, R Oudkerk
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of author nor the names of any contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+::::::::::::::
+Lib/optparse.py
+::::::::::::::
+Copyright (c) 2001-2006 Gregory P. Ward.  All rights reserved.
+Copyright (c) 2002-2006 Python Software Foundation.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the author nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+::::::::::::::
+Lib/platform.py
+::::::::::::::
+    Copyright (c) 1999-2000, Marc-Andre Lemburg; mailto:[email protected]
+    Copyright (c) 2000-2010, eGenix.com Software GmbH; mailto:[email protected]
+
+    Permission to use, copy, modify, and distribute this software and its
+    documentation for any purpose and without fee or royalty is hereby granted,
+    provided that the above copyright notice appear in all copies and that
+    both that copyright notice and this permission notice appear in
+    supporting documentation or portions thereof, including modifications,
+    that you make.
+
+    EGENIX.COM SOFTWARE GMBH DISCLAIMS ALL WARRANTIES WITH REGARD TO
+    THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
+    INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+    FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+    NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+    WITH THE USE OR PERFORMANCE OF THIS SOFTWARE !
+::::::::::::::
+Lib/profile.py
+::::::::::::::
+# Copyright Disney Enterprises, Inc.  All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+# either express or implied.  See the License for the specific language
+# governing permissions and limitations under the License.
+::::::::::::::
+Lib/sqlite3/__init__.py
+::::::::::::::
+# Copyright (C) 2005 Gerhard H?ring <[email protected]>
+#
+# This file is part of pysqlite.
+#
+# This software is provided 'as-is', without any express or implied
+# warranty.  In no event will the authors be held liable for any damages
+# arising from the use of this software.
+#
+# Permission is granted to anyone to use this software for any purpose,
+# including commercial applications, and to alter it and redistribute it
+# freely, subject to the following restrictions:
+#
+# 1. The origin of this software must not be misrepresented; you must not
+#    claim that you wrote the original software. If you use this software
+#    in a product, an acknowledgment in the product documentation would be
+#    appreciated but is not required.
+# 2. Altered source versions must be plainly marked as such, and must not be
+#    misrepresented as being the original software.
+# 3. This notice may not be removed or altered from any source distribution.
+::::::::::::::
+Lib/tarfile.py
+::::::::::::::
+# Copyright (C) 2002 Lars Gust?bel <[email protected]>
+# All rights reserved.
+#
+# Permission  is  hereby granted,  free  of charge,  to  any person
+# obtaining a  copy of  this software  and associated documentation
+# files  (the  "Software"),  to   deal  in  the  Software   without
+# restriction,  including  without limitation  the  rights to  use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies  of  the  Software,  and to  permit  persons  to  whom the
+# Software  is  furnished  to  do  so,  subject  to  the  following
+# conditions:
+#
+# The above copyright  notice and this  permission notice shall  be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY  KIND,
+# EXPRESS OR IMPLIED, INCLUDING  BUT NOT LIMITED TO  THE WARRANTIES
+# OF  MERCHANTABILITY,  FITNESS   FOR  A  PARTICULAR   PURPOSE  AND
+# NONINFRINGEMENT.  IN  NO  EVENT SHALL  THE  AUTHORS  OR COPYRIGHT
+# HOLDERS  BE LIABLE  FOR ANY  CLAIM, DAMAGES  OR OTHER  LIABILITY,
+# WHETHER  IN AN  ACTION OF  CONTRACT, TORT  OR OTHERWISE,  ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+::::::::::::::
+Lib/unittest.py
+::::::::::::::
+Copyright (c) 1999-2003 Steve Purcell
+This module is free software, and you may redistribute it and/or modify
+it under the same terms as Python itself, so long as this copyright message
+and disclaimer are retained in their original form.
+
+IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+::::::::::::::
+Modules/_localemodule.c
+::::::::::::::
+Copyright (C) 1997, 2002, 2003 Martin von Loewis
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies.
+
+This software comes with no warranty. Use at your own risk.
+::::::::::::::
+Modules/parsermodule.c
+::::::::::::::
+ *  Copyright 1995-1996 by Fred L. Drake, Jr. and Virginia Polytechnic
+ *  Institute and State University, Blacksburg, Virginia, USA.
+ *  Portions copyright 1991-1995 by Stichting Mathematisch Centrum,
+ *  Amsterdam, The Netherlands.  Copying is permitted under the terms
+ *  associated with the main Python distribution, with the additional
+ *  restriction that this additional notice be included and maintained
+ *  on all distributed copies.
+::::::::::::::
+Modules/timing.h
+::::::::::::::
+/*
+ * Copyright (c) 1993 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name, George Neville-Neil may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+::::::::::::::
+Parser/spark.py
+::::::::::::::
+#  Copyright (c) 1998-2002 John Aycock
+#
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  "Software"), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+#  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+#  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+#  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+::::::::::::::
+Python/getopt.c
+::::::::::::::
+ * Copyright 1992-1994, David Gottner
+ *
+ *                    All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice, this permission notice and
+ * the following disclaimer notice appear unmodified in all copies.
+ *
+ * I DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL I
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
+ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA, OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Nevertheless, I would like to know about bugs in this library or
+ * suggestions for improvment.  Send bug reports and feedback to
+ * [email protected]
+::::::::::::::
+Tools/pybench/LICENSE
+::::::::::::::
+pybench License
+---------------
+
+This copyright notice and license applies to all files in the pybench
+directory of the pybench distribution.
+
+Copyright (c), 1997-2006, Marc-Andre Lemburg ([email protected])
+Copyright (c), 2000-2006, eGenix.com Software GmbH ([email protected])
+
+                   All Rights Reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee or royalty is hereby
+granted, provided that the above copyright notice appear in all copies
+and that both that copyright notice and this permission notice appear
+in supporting documentation or portions thereof, including
+modifications, that you make.
+
+THE AUTHOR MARC-ANDRE LEMBURG DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE !
+::::::::::::::
+Tools/pynche/X/xlicense.txt
+::::::::::::::
+X Window System License - X11R6.4
+
+Copyright (c) 1998 The Open Group
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+X Window System is a trademark of The Open Group
+::::::::::::::
+install-sh
+::::::::::::::
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+#
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+::::::::::::::
+Include/dynamic_annotations.h
+Python/dynamic_annotations.c
+::::::::::::::
+/* Copyright (c) 2008-2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ---
+ * Author: Kostya Serebryany
+ */
+::::::::::::::
+Lib/statistics.py
+::::::::::::::
+##  Module statistics.py
+##
+##  Copyright (c) 2013 Steven D'Aprano <[email protected]>.
+##
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##  http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+
+		                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/components/python/python34/tkinter-34.p5m	Wed Oct 29 08:04:59 2014 -0700
+++ b/components/python/python34/tkinter-34.p5m	Wed Oct 29 14:12:28 2014 -0700
@@ -57,6 +57,25 @@
 file path=usr/lib/python3.4/tkinter/messagebox.py
 file path=usr/lib/python3.4/tkinter/scrolledtext.py
 file path=usr/lib/python3.4/tkinter/simpledialog.py
+file path=usr/lib/python3.4/tkinter/test/README
+file path=usr/lib/python3.4/tkinter/test/__init__.py
+file path=usr/lib/python3.4/tkinter/test/runtktests.py
+file path=usr/lib/python3.4/tkinter/test/support.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/__init__.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_font.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_geometry_managers.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_images.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_loadtk.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_misc.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_text.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_variables.py
+file path=usr/lib/python3.4/tkinter/test/test_tkinter/test_widgets.py
+file path=usr/lib/python3.4/tkinter/test/test_ttk/__init__.py
+file path=usr/lib/python3.4/tkinter/test/test_ttk/test_extensions.py
+file path=usr/lib/python3.4/tkinter/test/test_ttk/test_functions.py
+file path=usr/lib/python3.4/tkinter/test/test_ttk/test_style.py
+file path=usr/lib/python3.4/tkinter/test/test_ttk/test_widgets.py
+file path=usr/lib/python3.4/tkinter/test/widget_tests.py
 file path=usr/lib/python3.4/tkinter/tix.py
 file path=usr/lib/python3.4/tkinter/ttk.py
 #