Introduce two new versions of Python: 2.6 and 3.0rc1 (finally!)

Python 2.6 will be the next default python version when enough
testings of consumer ports are done.  The new "2to3" program is
renamed to 2to3-2.6 and 2to3-3.0 for each version, respectively.

Repo-copied by:	marcus

1 files changed, 274 insertions, 60 deletions

diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 5459479d7606..ca708124af99 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -1,3 +1,5 @@
+%%IF_DEFAULT%%bin/2to3
+bin/2to3-%%PYVER%%
 %%IF_DEFAULT%%bin/idle
 bin/idle%%PYVER%%
 %%IF_DEFAULT%%bin/pydoc
@@ -20,6 +22,9 @@ bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/bitset.h
 %%PYTHON_INCLUDEDIR%%/boolobject.h
 %%PYTHON_INCLUDEDIR%%/bufferobject.h
+%%PYTHON_INCLUDEDIR%%/bytearrayobject.h
+%%PYTHON_INCLUDEDIR%%/bytes_methods.h
+%%PYTHON_INCLUDEDIR%%/bytesobject.h
 %%PYTHON_INCLUDEDIR%%/cStringIO.h
 %%PYTHON_INCLUDEDIR%%/cellobject.h
 %%PYTHON_INCLUDEDIR%%/ceval.h
@@ -71,10 +76,13 @@ bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/pyexpat.h
 %%PYTHON_INCLUDEDIR%%/pyfpe.h
 %%PYTHON_INCLUDEDIR%%/pygetopt.h
+%%PYTHON_INCLUDEDIR%%/pymacconfig.h
 %%PYTHON_INCLUDEDIR%%/pymactoolbox.h
+%%PYTHON_INCLUDEDIR%%/pymath.h
 %%PYTHON_INCLUDEDIR%%/pymem.h
 %%PYTHON_INCLUDEDIR%%/pyport.h
 %%PYTHON_INCLUDEDIR%%/pystate.h
+%%PYTHON_INCLUDEDIR%%/pystrcmp.h
 %%PYTHON_INCLUDEDIR%%/pystrtod.h
 %%PYTHON_INCLUDEDIR%%/pythonrun.h
 %%PYTHON_INCLUDEDIR%%/pythread.h
@@ -92,6 +100,7 @@ bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/tupleobject.h
 %%PYTHON_INCLUDEDIR%%/ucnhash.h
 %%PYTHON_INCLUDEDIR%%/unicodeobject.h
+%%PYTHON_INCLUDEDIR%%/warnings.h
 %%PYTHON_INCLUDEDIR%%/weakrefobject.h
 lib/lib%%PYTHON_VERSION%%.so
 lib/lib%%PYTHON_VERSION%%.so.1
@@ -116,10 +125,13 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/_MozillaCookieJar.py
 %%PYTHON_LIBDIR%%/__future__.py
 %%PYTHON_LIBDIR%%/__phello__.foo.py
+%%PYTHON_LIBDIR%%/_abcoll.py
 %%PYTHON_LIBDIR%%/_strptime.py
 %%PYTHON_LIBDIR%%/_threading_local.py
+%%PYTHON_LIBDIR%%/abc.py
 %%PYTHON_LIBDIR%%/aifc.py
 %%PYTHON_LIBDIR%%/anydbm.py
+%%PYTHON_LIBDIR%%/ast.py
 %%PYTHON_LIBDIR%%/asynchat.py
 %%PYTHON_LIBDIR%%/asyncore.py
 %%PYTHON_LIBDIR%%/atexit.py
@@ -136,7 +148,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/bsddb/dbtables.py
 %%PYTHON_LIBDIR%%/bsddb/dbutils.py
 %%PYTHON_LIBDIR%%/bsddb/test/__init__.py
-%%PYTHON_LIBDIR%%/bsddb/test/test_1413192.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_all.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_associate.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_basics.py
@@ -146,7 +157,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbobj.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbshelve.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_dbtables.py
-%%PYTHON_LIBDIR%%/bsddb/test/test_env_close.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_distributed_transactions.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_early_close.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_get_none.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_join.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_lock.py
@@ -154,6 +166,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/bsddb/test/test_pickle.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_queue.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_recno.py
+%%PYTHON_LIBDIR%%/bsddb/test/test_replication.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_sequence.py
 %%PYTHON_LIBDIR%%/bsddb/test/test_thread.py
 %%PYTHON_LIBDIR%%/cProfile.py
@@ -165,6 +178,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/code.py
 %%PYTHON_LIBDIR%%/codecs.py
 %%PYTHON_LIBDIR%%/codeop.py
+%%PYTHON_LIBDIR%%/collections.py
 %%PYTHON_LIBDIR%%/colorsys.py
 %%PYTHON_LIBDIR%%/commands.py
 %%PYTHON_LIBDIR%%/compileall.py
@@ -219,7 +233,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_checkretval.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_delattr.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_errcheck.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_errno.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_find.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_frombuffer.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_funcptr.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_functions.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_incomplete.py
@@ -234,6 +250,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/ctypes/test/test_numbers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_objects.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_parameters.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_pep3118.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_pickling.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_pointers.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_prototypes.py
 %%PYTHON_LIBDIR%%/ctypes/test/test_python_api.py
@@ -295,8 +313,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/distutils/command/register.py
 %%PYTHON_LIBDIR%%/distutils/command/sdist.py
 %%PYTHON_LIBDIR%%/distutils/command/upload.py
-%%PYTHON_LIBDIR%%/distutils/command/wininst-6.exe
+%%PYTHON_LIBDIR%%/distutils/command/wininst-6.0.exe
 %%PYTHON_LIBDIR%%/distutils/command/wininst-7.1.exe
+%%PYTHON_LIBDIR%%/distutils/command/wininst-8.0.exe
+%%PYTHON_LIBDIR%%/distutils/command/wininst-9.0-amd64.exe
+%%PYTHON_LIBDIR%%/distutils/command/wininst-9.0.exe
+%%PYTHON_LIBDIR%%/distutils/config.py
 %%PYTHON_LIBDIR%%/distutils/core.py
 %%PYTHON_LIBDIR%%/distutils/cygwinccompiler.py
 %%PYTHON_LIBDIR%%/distutils/debug.py
@@ -310,17 +332,23 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/distutils/file_util.py
 %%PYTHON_LIBDIR%%/distutils/filelist.py
 %%PYTHON_LIBDIR%%/distutils/log.py
+%%PYTHON_LIBDIR%%/distutils/msvc9compiler.py
 %%PYTHON_LIBDIR%%/distutils/msvccompiler.py
 %%PYTHON_LIBDIR%%/distutils/mwerkscompiler.py
 %%PYTHON_LIBDIR%%/distutils/spawn.py
 %%PYTHON_LIBDIR%%/distutils/sysconfig.py
 %%PYTHON_LIBDIR%%/distutils/tests/__init__.py
 %%PYTHON_LIBDIR%%/distutils/tests/support.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_build_ext.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_build_py.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_build_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_config.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_core.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_dist.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_install.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_install_scripts.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_sysconfig.py
+%%PYTHON_LIBDIR%%/distutils/tests/test_upload.py
 %%PYTHON_LIBDIR%%/distutils/tests/test_versionpredicate.py
 %%PYTHON_LIBDIR%%/distutils/text_file.py
 %%PYTHON_LIBDIR%%/distutils/unixccompiler.py
@@ -517,6 +545,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/encodings/utf_16.py
 %%PYTHON_LIBDIR%%/encodings/utf_16_be.py
 %%PYTHON_LIBDIR%%/encodings/utf_16_le.py
+%%PYTHON_LIBDIR%%/encodings/utf_32.py
+%%PYTHON_LIBDIR%%/encodings/utf_32_be.py
+%%PYTHON_LIBDIR%%/encodings/utf_32_le.py
 %%PYTHON_LIBDIR%%/encodings/utf_7.py
 %%PYTHON_LIBDIR%%/encodings/utf_8.py
 %%PYTHON_LIBDIR%%/encodings/utf_8_sig.py
@@ -527,13 +558,14 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/fnmatch.py
 %%PYTHON_LIBDIR%%/formatter.py
 %%PYTHON_LIBDIR%%/fpformat.py
+%%PYTHON_LIBDIR%%/fractions.py
 %%PYTHON_LIBDIR%%/ftplib.py
 %%PYTHON_LIBDIR%%/functools.py
+%%PYTHON_LIBDIR%%/genericpath.py
 %%PYTHON_LIBDIR%%/getopt.py
 %%PYTHON_LIBDIR%%/getpass.py
 %%PYTHON_LIBDIR%%/gettext.py
 %%PYTHON_LIBDIR%%/glob.py
-%%PYTHON_LIBDIR%%/gopherlib.py
 %%PYTHON_LIBDIR%%/gzip.py
 %%PYTHON_LIBDIR%%/hashlib.py
 %%PYTHON_LIBDIR%%/heapq.py
@@ -621,7 +653,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/idlelib/macosxSupport.py
 %%PYTHON_LIBDIR%%/idlelib/rpc.py
 %%PYTHON_LIBDIR%%/idlelib/run.py
-%%PYTHON_LIBDIR%%/idlelib/tabpage.py
+%%PYTHON_LIBDIR%%/idlelib/tabbedpages.py
 %%PYTHON_LIBDIR%%/idlelib/testcode.py
 %%PYTHON_LIBDIR%%/idlelib/textView.py
 %%PYTHON_LIBDIR%%/ihooks.py
@@ -629,28 +661,132 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/imghdr.py
 %%PYTHON_LIBDIR%%/imputil.py
 %%PYTHON_LIBDIR%%/inspect.py
+%%PYTHON_LIBDIR%%/io.py
+%%PYTHON_LIBDIR%%/json/__init__.py
+%%PYTHON_LIBDIR%%/json/decoder.py
+%%PYTHON_LIBDIR%%/json/encoder.py
+%%PYTHON_LIBDIR%%/json/scanner.py
+%%PYTHON_LIBDIR%%/json/tests/__init__.py
+%%PYTHON_LIBDIR%%/json/tests/test_decode.py
+%%PYTHON_LIBDIR%%/json/tests/test_default.py
+%%PYTHON_LIBDIR%%/json/tests/test_dump.py
+%%PYTHON_LIBDIR%%/json/tests/test_encode_basestring_ascii.py
+%%PYTHON_LIBDIR%%/json/tests/test_fail.py
+%%PYTHON_LIBDIR%%/json/tests/test_float.py
+%%PYTHON_LIBDIR%%/json/tests/test_indent.py
+%%PYTHON_LIBDIR%%/json/tests/test_pass1.py
+%%PYTHON_LIBDIR%%/json/tests/test_pass2.py
+%%PYTHON_LIBDIR%%/json/tests/test_pass3.py
+%%PYTHON_LIBDIR%%/json/tests/test_recursion.py
+%%PYTHON_LIBDIR%%/json/tests/test_scanstring.py
+%%PYTHON_LIBDIR%%/json/tests/test_separators.py
+%%PYTHON_LIBDIR%%/json/tests/test_speedups.py
+%%PYTHON_LIBDIR%%/json/tests/test_unicode.py
+%%PYTHON_LIBDIR%%/json/tool.py
 %%PYTHON_LIBDIR%%/keyword.py
+%%PYTHON_LIBDIR%%/lib2to3/Grammar.txt
+%%PYTHON_LIBDIR%%/lib2to3/Grammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar.txt
+%%PYTHON_LIBDIR%%/lib2to3/PatternGrammar2.6.0.final.0.pickle
+%%PYTHON_LIBDIR%%/lib2to3/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/fixer_base.py
+%%PYTHON_LIBDIR%%/lib2to3/fixer_util.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_apply.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_basestring.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_buffer.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_callable.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_dict.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_except.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_exec.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_execfile.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_filter.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_funcattrs.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_future.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_has_key.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_idioms.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_import.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_imports2.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_input.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_intern.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_itertools.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_itertools_imports.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_long.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_map.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_metaclass.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_methodattrs.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_ne.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_next.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_nonzero.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_numliterals.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_paren.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_print.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raise.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_raw_input.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_renames.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_repr.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_standarderror.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_sys_exc.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_throw.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_tuple_params.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_types.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_unicode.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_urllib.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_ws_comma.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_xrange.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_xreadlines.py
+%%PYTHON_LIBDIR%%/lib2to3/fixes/fix_zip.py
+%%PYTHON_LIBDIR%%/lib2to3/main.py
+%%PYTHON_LIBDIR%%/lib2to3/patcomp.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/conv.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/driver.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/grammar.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/literals.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/parse.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/pgen.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/token.py
+%%PYTHON_LIBDIR%%/lib2to3/pgen2/tokenize.py
+%%PYTHON_LIBDIR%%/lib2to3/pygram.py
+%%PYTHON_LIBDIR%%/lib2to3/pytree.py
+%%PYTHON_LIBDIR%%/lib2to3/refactor.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/__init__.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/benchmark.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/pytree_idempotency.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/support.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_all_fixers.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_fixers.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_parser.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_pytree.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_refactor.py
+%%PYTHON_LIBDIR%%/lib2to3/tests/test_util.py
 %%PYTHON_LIBDIR%%/lib-dynload/Python-%%PYVER_WITHPAT%%-py%%PYVER%%.egg-info
 %%PYTHON_LIBDIR%%/lib-dynload/_bisect.so
+%%PYTHON_LIBDIR%%/lib-dynload/_bytesio.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_cn.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_hk.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_iso2022.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_jp.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_kr.so
 %%PYTHON_LIBDIR%%/lib-dynload/_codecs_tw.so
+%%PYTHON_LIBDIR%%/lib-dynload/_collections.so
 %%PYTHON_LIBDIR%%/lib-dynload/_csv.so
 %%PYTHON_LIBDIR%%/lib-dynload/_ctypes.so
 %%PYTHON_LIBDIR%%/lib-dynload/_ctypes_test.so
 %%PYTHON_LIBDIR%%/lib-dynload/_curses.so
 %%PYTHON_LIBDIR%%/lib-dynload/_curses_panel.so
 %%PYTHON_LIBDIR%%/lib-dynload/_elementtree.so
+%%PYTHON_LIBDIR%%/lib-dynload/_fileio.so
 %%PYTHON_LIBDIR%%/lib-dynload/_functools.so
 %%PYTHON_LIBDIR%%/lib-dynload/_hashlib.so
 %%PYTHON_LIBDIR%%/lib-dynload/_heapq.so
 %%PYTHON_LIBDIR%%/lib-dynload/_hotshot.so
+%%PYTHON_LIBDIR%%/lib-dynload/_json.so
 %%PYTHON_LIBDIR%%/lib-dynload/_locale.so
 %%PYTHON_LIBDIR%%/lib-dynload/_lsprof.so
 %%PYTHON_LIBDIR%%/lib-dynload/_multibytecodec.so
+%%PYTHON_LIBDIR%%/lib-dynload/_multiprocessing.so
 %%PYTHON_LIBDIR%%/lib-dynload/_random.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha256.so
 %%PYTHON_LIBDIR%%/lib-dynload/_sha512.so
@@ -667,12 +803,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib-dynload/cPickle.so
 %%PYTHON_LIBDIR%%/lib-dynload/cStringIO.so
 %%PYTHON_LIBDIR%%/lib-dynload/cmath.so
-%%PYTHON_LIBDIR%%/lib-dynload/collections.so
 %%PYTHON_LIBDIR%%/lib-dynload/crypt.so
 %%PYTHON_LIBDIR%%/lib-dynload/datetime.so
 %%PYTHON_LIBDIR%%/lib-dynload/dbm.so
 %%32BIT_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/dl.so
 %%PYTHON_LIBDIR%%/lib-dynload/fcntl.so
+%%PYTHON_LIBDIR%%/lib-dynload/future_builtins.so
 %%PYTHON_LIBDIR%%/lib-dynload/grp.so
 %%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/imageop.so
 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so
@@ -685,7 +821,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/lib-dynload/pyexpat.so
 %%PYTHON_LIBDIR%%/lib-dynload/readline.so
 %%PYTHON_LIBDIR%%/lib-dynload/resource.so
-%%X86_ONLY%%%%PYTHON_LIBDIR%%/lib-dynload/rgbimg.so
 %%PYTHON_LIBDIR%%/lib-dynload/select.so
 %%PYTHON_LIBDIR%%/lib-dynload/strop.so
 %%PYTHON_LIBDIR%%/lib-dynload/syslog.so
@@ -727,12 +862,27 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/mimify.py
 %%PYTHON_LIBDIR%%/modulefinder.py
 %%PYTHON_LIBDIR%%/multifile.py
+%%PYTHON_LIBDIR%%/multiprocessing/__init__.py
+%%PYTHON_LIBDIR%%/multiprocessing/connection.py
+%%PYTHON_LIBDIR%%/multiprocessing/dummy/__init__.py
+%%PYTHON_LIBDIR%%/multiprocessing/dummy/connection.py
+%%PYTHON_LIBDIR%%/multiprocessing/forking.py
+%%PYTHON_LIBDIR%%/multiprocessing/heap.py
+%%PYTHON_LIBDIR%%/multiprocessing/managers.py
+%%PYTHON_LIBDIR%%/multiprocessing/pool.py
+%%PYTHON_LIBDIR%%/multiprocessing/process.py
+%%PYTHON_LIBDIR%%/multiprocessing/queues.py
+%%PYTHON_LIBDIR%%/multiprocessing/reduction.py
+%%PYTHON_LIBDIR%%/multiprocessing/sharedctypes.py
+%%PYTHON_LIBDIR%%/multiprocessing/synchronize.py
+%%PYTHON_LIBDIR%%/multiprocessing/util.py
 %%PYTHON_LIBDIR%%/mutex.py
 %%PYTHON_LIBDIR%%/netrc.py
 %%PYTHON_LIBDIR%%/new.py
 %%PYTHON_LIBDIR%%/nntplib.py
 %%PYTHON_LIBDIR%%/ntpath.py
 %%PYTHON_LIBDIR%%/nturl2path.py
+%%PYTHON_LIBDIR%%/numbers.py
 %%PYTHON_LIBDIR%%/opcode.py
 %%PYTHON_LIBDIR%%/optparse.py
 %%PYTHON_LIBDIR%%/os.py
@@ -754,6 +904,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/plat-freebsd8/IN.py
 %%PYTHON_LIBDIR%%/plat-freebsd8/regen
 %%PYTHON_LIBDIR%%/platform.py
+%%PYTHON_LIBDIR%%/plistlib.py
 %%PYTHON_LIBDIR%%/popen2.py
 %%PYTHON_LIBDIR%%/poplib.py
 %%PYTHON_LIBDIR%%/posixfile.py
@@ -765,6 +916,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/py_compile.py
 %%PYTHON_LIBDIR%%/pyclbr.py
 %%PYTHON_LIBDIR%%/pydoc.py
+%%PYTHON_LIBDIR%%/pydoc_topics.py
 %%PYTHON_LIBDIR%%/quopri.py
 %%PYTHON_LIBDIR%%/random.py
 %%PYTHON_LIBDIR%%/re.py
@@ -789,10 +941,13 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/socket.py
 %%PYTHON_LIBDIR%%/sqlite3/__init__.py
 %%PYTHON_LIBDIR%%/sqlite3/dbapi2.py
+%%PYTHON_LIBDIR%%/sqlite3/dump.py
 %%PYTHON_LIBDIR%%/sqlite3/test/__init__.py
 %%PYTHON_LIBDIR%%/sqlite3/test/dbapi.py
+%%PYTHON_LIBDIR%%/sqlite3/test/dump.py
 %%PYTHON_LIBDIR%%/sqlite3/test/factory.py
 %%PYTHON_LIBDIR%%/sqlite3/test/hooks.py
+%%PYTHON_LIBDIR%%/sqlite3/test/py25tests.py
 %%PYTHON_LIBDIR%%/sqlite3/test/regression.py
 %%PYTHON_LIBDIR%%/sqlite3/test/transactions.py
 %%PYTHON_LIBDIR%%/sqlite3/test/types.py
@@ -801,6 +956,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/sre_compile.py
 %%PYTHON_LIBDIR%%/sre_constants.py
 %%PYTHON_LIBDIR%%/sre_parse.py
+%%PYTHON_LIBDIR%%/ssl.py
 %%PYTHON_LIBDIR%%/stat.py
 %%PYTHON_LIBDIR%%/statvfs.py
 %%PYTHON_LIBDIR%%/string.py
@@ -823,6 +979,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/autotest.py
 %%PYTHON_LIBDIR%%/test/bad_coding.py
 %%PYTHON_LIBDIR%%/test/bad_coding2.py
+%%PYTHON_LIBDIR%%/test/badcert.pem
+%%PYTHON_LIBDIR%%/test/badkey.pem
 %%PYTHON_LIBDIR%%/test/badsyntax_future3.py
 %%PYTHON_LIBDIR%%/test/badsyntax_future4.py
 %%PYTHON_LIBDIR%%/test/badsyntax_future5.py
@@ -831,9 +989,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/badsyntax_future8.py
 %%PYTHON_LIBDIR%%/test/badsyntax_future9.py
 %%PYTHON_LIBDIR%%/test/badsyntax_nocaret.py
+%%PYTHON_LIBDIR%%/test/buffer_tests.py
 %%PYTHON_LIBDIR%%/test/cfgparser.1
 %%PYTHON_LIBDIR%%/test/check_soundcard.vbs
 %%PYTHON_LIBDIR%%/test/cjkencodings_test.py
+%%PYTHON_LIBDIR%%/test/cmath_testcases.txt
+%%PYTHON_LIBDIR%%/test/curses_tests.py
 %%PYTHON_LIBDIR%%/test/decimaltestdata/abs.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/add.decTest
 %%PYTHON_LIBDIR%%/test/decimaltestdata/and.decTest
@@ -981,74 +1142,51 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/double_const.py
 %%PYTHON_LIBDIR%%/test/empty.vbs
 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt
+%%PYTHON_LIBDIR%%/test/floating_points.txt
 %%PYTHON_LIBDIR%%/test/fork_wait.py
 %%PYTHON_LIBDIR%%/test/greyrgb.uue
+%%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem
+%%PYTHON_LIBDIR%%/test/ieee754.txt
 %%PYTHON_LIBDIR%%/test/infinite_reload.py
 %%PYTHON_LIBDIR%%/test/inspect_fodder.py
 %%PYTHON_LIBDIR%%/test/inspect_fodder2.py
+%%PYTHON_LIBDIR%%/test/keycert.pem
 %%PYTHON_LIBDIR%%/test/list_tests.py
 %%PYTHON_LIBDIR%%/test/mapping_tests.py
-%%PYTHON_LIBDIR%%/test/output/test_MimeWriter
-%%PYTHON_LIBDIR%%/test/output/test_cProfile
-%%PYTHON_LIBDIR%%/test/output/test_cgi
-%%PYTHON_LIBDIR%%/test/output/test_class
-%%PYTHON_LIBDIR%%/test/output/test_cookie
-%%PYTHON_LIBDIR%%/test/output/test_extcall
-%%PYTHON_LIBDIR%%/test/output/test_frozen
-%%PYTHON_LIBDIR%%/test/output/test_global
-%%PYTHON_LIBDIR%%/test/output/test_grammar
-%%PYTHON_LIBDIR%%/test/output/test_httplib
-%%PYTHON_LIBDIR%%/test/output/test_linuxaudiodev
-%%PYTHON_LIBDIR%%/test/output/test_logging
-%%PYTHON_LIBDIR%%/test/output/test_math
-%%PYTHON_LIBDIR%%/test/output/test_mmap
-%%PYTHON_LIBDIR%%/test/output/test_new
-%%PYTHON_LIBDIR%%/test/output/test_nis
-%%PYTHON_LIBDIR%%/test/output/test_opcodes
-%%PYTHON_LIBDIR%%/test/output/test_openpty
-%%PYTHON_LIBDIR%%/test/output/test_operations
-%%PYTHON_LIBDIR%%/test/output/test_ossaudiodev
-%%PYTHON_LIBDIR%%/test/output/test_pep277
-%%PYTHON_LIBDIR%%/test/output/test_pkg
-%%PYTHON_LIBDIR%%/test/output/test_poll
-%%PYTHON_LIBDIR%%/test/output/test_popen
-%%PYTHON_LIBDIR%%/test/output/test_popen2
-%%PYTHON_LIBDIR%%/test/output/test_profile
-%%PYTHON_LIBDIR%%/test/output/test_pty
-%%PYTHON_LIBDIR%%/test/output/test_pyexpat
-%%PYTHON_LIBDIR%%/test/output/test_regex
-%%PYTHON_LIBDIR%%/test/output/test_resource
-%%PYTHON_LIBDIR%%/test/output/test_rgbimg
-%%PYTHON_LIBDIR%%/test/output/test_scope
-%%PYTHON_LIBDIR%%/test/output/test_signal
-%%PYTHON_LIBDIR%%/test/output/test_thread
-%%PYTHON_LIBDIR%%/test/output/test_threadedtempfile
-%%PYTHON_LIBDIR%%/test/output/test_tokenize
-%%PYTHON_LIBDIR%%/test/output/test_types
-%%PYTHON_LIBDIR%%/test/output/test_winreg
-%%PYTHON_LIBDIR%%/test/output/test_xdrlib
-%%PYTHON_LIBDIR%%/test/output/xmltests
+%%PYTHON_LIBDIR%%/test/nullcert.pem
 %%PYTHON_LIBDIR%%/test/outstanding_bugs.py
 %%PYTHON_LIBDIR%%/test/pickletester.py
+%%PYTHON_LIBDIR%%/test/profilee.py
 %%PYTHON_LIBDIR%%/test/pyclbr_input.py
+%%PYTHON_LIBDIR%%/test/pydoc_mod.py
 %%PYTHON_LIBDIR%%/test/pydocfodder.py
 %%PYTHON_LIBDIR%%/test/pystone.py
+%%PYTHON_LIBDIR%%/test/randv2_32.pck
+%%PYTHON_LIBDIR%%/test/randv2_64.pck
+%%PYTHON_LIBDIR%%/test/randv3.pck
 %%PYTHON_LIBDIR%%/test/re_tests.py
 %%PYTHON_LIBDIR%%/test/regex_tests.py
 %%PYTHON_LIBDIR%%/test/regrtest.py
+%%PYTHON_LIBDIR%%/test/relimport.py
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
 %%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sortperf.py
+%%PYTHON_LIBDIR%%/test/ssl_cert.pem
+%%PYTHON_LIBDIR%%/test/ssl_key.pem
 %%PYTHON_LIBDIR%%/test/string_tests.py
+%%PYTHON_LIBDIR%%/test/svn_python_org_https_cert.pem
 %%PYTHON_LIBDIR%%/test/test.xml
 %%PYTHON_LIBDIR%%/test/test.xml.out
 %%PYTHON_LIBDIR%%/test/test_MimeWriter.py
+%%PYTHON_LIBDIR%%/test/test_SimpleHTTPServer.py
 %%PYTHON_LIBDIR%%/test/test_StringIO.py
 %%PYTHON_LIBDIR%%/test/test___all__.py
 %%PYTHON_LIBDIR%%/test/test___future__.py
 %%PYTHON_LIBDIR%%/test/test__locale.py
+%%PYTHON_LIBDIR%%/test/test_abc.py
+%%PYTHON_LIBDIR%%/test/test_abstract_numbers.py
 %%PYTHON_LIBDIR%%/test/test_aepack.py
 %%PYTHON_LIBDIR%%/test/test_al.py
 %%PYTHON_LIBDIR%%/test/test_anydbm.py
@@ -1056,6 +1194,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_array.py
 %%PYTHON_LIBDIR%%/test/test_ast.py
 %%PYTHON_LIBDIR%%/test/test_asynchat.py
+%%PYTHON_LIBDIR%%/test/test_asyncore.py
 %%PYTHON_LIBDIR%%/test/test_atexit.py
 %%PYTHON_LIBDIR%%/test/test_audioop.py
 %%PYTHON_LIBDIR%%/test/test_augassign.py
@@ -1071,10 +1210,11 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_bsddb.py
 %%PYTHON_LIBDIR%%/test/test_bsddb185.py
 %%PYTHON_LIBDIR%%/test/test_bsddb3.py
+%%PYTHON_LIBDIR%%/test/test_buffer.py
 %%PYTHON_LIBDIR%%/test/test_bufio.py
 %%PYTHON_LIBDIR%%/test/test_builtin.py
+%%PYTHON_LIBDIR%%/test/test_bytes.py
 %%PYTHON_LIBDIR%%/test/test_bz2.py
-%%PYTHON_LIBDIR%%/test/test_cProfile.py
 %%PYTHON_LIBDIR%%/test/test_calendar.py
 %%PYTHON_LIBDIR%%/test/test_call.py
 %%PYTHON_LIBDIR%%/test/test_capi.py
@@ -1085,7 +1225,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_cl.py
 %%PYTHON_LIBDIR%%/test/test_class.py
 %%PYTHON_LIBDIR%%/test/test_cmath.py
+%%PYTHON_LIBDIR%%/test/test_cmd.py
 %%PYTHON_LIBDIR%%/test/test_cmd_line.py
+%%PYTHON_LIBDIR%%/test/test_cmd_line_script.py
 %%PYTHON_LIBDIR%%/test/test_code.py
 %%PYTHON_LIBDIR%%/test/test_codeccallbacks.py
 %%PYTHON_LIBDIR%%/test/test_codecencodings_cn.py
@@ -1102,6 +1244,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_codeop.py
 %%PYTHON_LIBDIR%%/test/test_coding.py
 %%PYTHON_LIBDIR%%/test/test_coercion.py
+%%PYTHON_LIBDIR%%/test/test_collections.py
 %%PYTHON_LIBDIR%%/test/test_colorsys.py
 %%PYTHON_LIBDIR%%/test/test_commands.py
 %%PYTHON_LIBDIR%%/test/test_compare.py
@@ -1116,6 +1259,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_copy.py
 %%PYTHON_LIBDIR%%/test/test_copy_reg.py
 %%PYTHON_LIBDIR%%/test/test_cpickle.py
+%%PYTHON_LIBDIR%%/test/test_cprofile.py
 %%PYTHON_LIBDIR%%/test/test_crypt.py
 %%PYTHON_LIBDIR%%/test/test_csv.py
 %%PYTHON_LIBDIR%%/test/test_ctypes.py
@@ -1141,6 +1285,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_doctest2.txt
 %%PYTHON_LIBDIR%%/test/test_doctest3.txt
 %%PYTHON_LIBDIR%%/test/test_doctest4.txt
+%%PYTHON_LIBDIR%%/test/test_docxmlrpc.py
 %%PYTHON_LIBDIR%%/test/test_dumbdbm.py
 %%PYTHON_LIBDIR%%/test/test_dummy_thread.py
 %%PYTHON_LIBDIR%%/test/test_dummy_threading.py
@@ -1149,6 +1294,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_email_renamed.py
 %%PYTHON_LIBDIR%%/test/test_enumerate.py
 %%PYTHON_LIBDIR%%/test/test_eof.py
+%%PYTHON_LIBDIR%%/test/test_epoll.py
 %%PYTHON_LIBDIR%%/test/test_errno.py
 %%PYTHON_LIBDIR%%/test/test_exception_variations.py
 %%PYTHON_LIBDIR%%/test/test_exceptions.py
@@ -1157,21 +1303,27 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_file.py
 %%PYTHON_LIBDIR%%/test/test_filecmp.py
 %%PYTHON_LIBDIR%%/test/test_fileinput.py
+%%PYTHON_LIBDIR%%/test/test_fileio.py
 %%PYTHON_LIBDIR%%/test/test_float.py
 %%PYTHON_LIBDIR%%/test/test_fnmatch.py
 %%PYTHON_LIBDIR%%/test/test_fork1.py
 %%PYTHON_LIBDIR%%/test/test_format.py
 %%PYTHON_LIBDIR%%/test/test_fpformat.py
+%%PYTHON_LIBDIR%%/test/test_fractions.py
 %%PYTHON_LIBDIR%%/test/test_frozen.py
+%%PYTHON_LIBDIR%%/test/test_ftplib.py
 %%PYTHON_LIBDIR%%/test/test_funcattrs.py
 %%PYTHON_LIBDIR%%/test/test_functools.py
 %%PYTHON_LIBDIR%%/test/test_future.py
 %%PYTHON_LIBDIR%%/test/test_future1.py
 %%PYTHON_LIBDIR%%/test/test_future2.py
 %%PYTHON_LIBDIR%%/test/test_future3.py
+%%PYTHON_LIBDIR%%/test/test_future4.py
+%%PYTHON_LIBDIR%%/test/test_future_builtins.py
 %%PYTHON_LIBDIR%%/test/test_gc.py
 %%PYTHON_LIBDIR%%/test/test_gdbm.py
 %%PYTHON_LIBDIR%%/test/test_generators.py
+%%PYTHON_LIBDIR%%/test/test_genericpath.py
 %%PYTHON_LIBDIR%%/test/test_genexps.py
 %%PYTHON_LIBDIR%%/test/test_getargs.py
 %%PYTHON_LIBDIR%%/test/test_getargs2.py
@@ -1186,12 +1338,12 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_hash.py
 %%PYTHON_LIBDIR%%/test/test_hashlib.py
 %%PYTHON_LIBDIR%%/test/test_heapq.py
-%%PYTHON_LIBDIR%%/test/test_hexoct.py
 %%PYTHON_LIBDIR%%/test/test_hmac.py
 %%PYTHON_LIBDIR%%/test/test_hotshot.py
 %%PYTHON_LIBDIR%%/test/test_htmllib.py
 %%PYTHON_LIBDIR%%/test/test_htmlparser.py
 %%PYTHON_LIBDIR%%/test/test_httplib.py
+%%PYTHON_LIBDIR%%/test/test_httpservers.py
 %%PYTHON_LIBDIR%%/test/test_imageop.py
 %%PYTHON_LIBDIR%%/test/test_imaplib.py
 %%PYTHON_LIBDIR%%/test/test_imgfile.py
@@ -1200,12 +1352,18 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_importhooks.py
 %%PYTHON_LIBDIR%%/test/test_index.py
 %%PYTHON_LIBDIR%%/test/test_inspect.py
+%%PYTHON_LIBDIR%%/test/test_int.py
+%%PYTHON_LIBDIR%%/test/test_int_literal.py
+%%PYTHON_LIBDIR%%/test/test_io.py
 %%PYTHON_LIBDIR%%/test/test_ioctl.py
 %%PYTHON_LIBDIR%%/test/test_isinstance.py
 %%PYTHON_LIBDIR%%/test/test_iter.py
 %%PYTHON_LIBDIR%%/test/test_iterlen.py
 %%PYTHON_LIBDIR%%/test/test_itertools.py
+%%PYTHON_LIBDIR%%/test/test_json.py
+%%PYTHON_LIBDIR%%/test/test_kqueue.py
 %%PYTHON_LIBDIR%%/test/test_largefile.py
+%%PYTHON_LIBDIR%%/test/test_lib2to3.py
 %%PYTHON_LIBDIR%%/test/test_linuxaudiodev.py
 %%PYTHON_LIBDIR%%/test/test_list.py
 %%PYTHON_LIBDIR%%/test/test_locale.py
@@ -1213,23 +1371,27 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_long.py
 %%PYTHON_LIBDIR%%/test/test_long_future.py
 %%PYTHON_LIBDIR%%/test/test_longexp.py
-%%PYTHON_LIBDIR%%/test/test_macfs.py
+%%PYTHON_LIBDIR%%/test/test_macos.py
 %%PYTHON_LIBDIR%%/test/test_macostools.py
 %%PYTHON_LIBDIR%%/test/test_macpath.py
 %%PYTHON_LIBDIR%%/test/test_mailbox.py
 %%PYTHON_LIBDIR%%/test/test_marshal.py
 %%PYTHON_LIBDIR%%/test/test_math.py
 %%PYTHON_LIBDIR%%/test/test_md5.py
+%%PYTHON_LIBDIR%%/test/test_memoryio.py
 %%PYTHON_LIBDIR%%/test/test_mhlib.py
 %%PYTHON_LIBDIR%%/test/test_mimetools.py
 %%PYTHON_LIBDIR%%/test/test_mimetypes.py
 %%PYTHON_LIBDIR%%/test/test_minidom.py
 %%PYTHON_LIBDIR%%/test/test_mmap.py
 %%PYTHON_LIBDIR%%/test/test_module.py
+%%PYTHON_LIBDIR%%/test/test_modulefinder.py
 %%PYTHON_LIBDIR%%/test/test_multibytecodec.py
 %%PYTHON_LIBDIR%%/test/test_multibytecodec_support.py
 %%PYTHON_LIBDIR%%/test/test_multifile.py
+%%PYTHON_LIBDIR%%/test/test_multiprocessing.py
 %%PYTHON_LIBDIR%%/test/test_mutants.py
+%%PYTHON_LIBDIR%%/test/test_mutex.py
 %%PYTHON_LIBDIR%%/test/test_netrc.py
 %%PYTHON_LIBDIR%%/test/test_new.py
 %%PYTHON_LIBDIR%%/test/test_nis.py
@@ -1238,7 +1400,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_old_mailbox.py
 %%PYTHON_LIBDIR%%/test/test_opcodes.py
 %%PYTHON_LIBDIR%%/test/test_openpty.py
-%%PYTHON_LIBDIR%%/test/test_operations.py
 %%PYTHON_LIBDIR%%/test/test_operator.py
 %%PYTHON_LIBDIR%%/test/test_optparse.py
 %%PYTHON_LIBDIR%%/test/test_os.py
@@ -1252,22 +1413,30 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_pep352.py
 %%PYTHON_LIBDIR%%/test/test_pickle.py
 %%PYTHON_LIBDIR%%/test/test_pickletools.py
+%%PYTHON_LIBDIR%%/test/test_pipes.py
 %%PYTHON_LIBDIR%%/test/test_pkg.py
 %%PYTHON_LIBDIR%%/test/test_pkgimport.py
+%%PYTHON_LIBDIR%%/test/test_pkgutil.py
 %%PYTHON_LIBDIR%%/test/test_platform.py
 %%PYTHON_LIBDIR%%/test/test_plistlib.py
 %%PYTHON_LIBDIR%%/test/test_poll.py
 %%PYTHON_LIBDIR%%/test/test_popen.py
 %%PYTHON_LIBDIR%%/test/test_popen2.py
+%%PYTHON_LIBDIR%%/test/test_poplib.py
 %%PYTHON_LIBDIR%%/test/test_posix.py
 %%PYTHON_LIBDIR%%/test/test_posixpath.py
 %%PYTHON_LIBDIR%%/test/test_pow.py
 %%PYTHON_LIBDIR%%/test/test_pprint.py
+%%PYTHON_LIBDIR%%/test/test_print.py
 %%PYTHON_LIBDIR%%/test/test_profile.py
 %%PYTHON_LIBDIR%%/test/test_profilehooks.py
+%%PYTHON_LIBDIR%%/test/test_property.py
+%%PYTHON_LIBDIR%%/test/test_pstats.py
 %%PYTHON_LIBDIR%%/test/test_pty.py
 %%PYTHON_LIBDIR%%/test/test_pwd.py
+%%PYTHON_LIBDIR%%/test/test_py3kwarn.py
 %%PYTHON_LIBDIR%%/test/test_pyclbr.py
+%%PYTHON_LIBDIR%%/test/test_pydoc.py
 %%PYTHON_LIBDIR%%/test/test_pyexpat.py
 %%PYTHON_LIBDIR%%/test/test_queue.py
 %%PYTHON_LIBDIR%%/test/test_quopri.py
@@ -1276,7 +1445,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_repr.py
 %%PYTHON_LIBDIR%%/test/test_resource.py
 %%PYTHON_LIBDIR%%/test/test_rfc822.py
-%%PYTHON_LIBDIR%%/test/test_rgbimg.py
 %%PYTHON_LIBDIR%%/test/test_richcmp.py
 %%PYTHON_LIBDIR%%/test/test_robotparser.py
 %%PYTHON_LIBDIR%%/test/test_runpy.py
@@ -1294,12 +1462,13 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_signal.py
 %%PYTHON_LIBDIR%%/test/test_site.py
 %%PYTHON_LIBDIR%%/test/test_slice.py
+%%PYTHON_LIBDIR%%/test/test_smtplib.py
 %%PYTHON_LIBDIR%%/test/test_socket.py
-%%PYTHON_LIBDIR%%/test/test_socket_ssl.py
 %%PYTHON_LIBDIR%%/test/test_socketserver.py
 %%PYTHON_LIBDIR%%/test/test_softspace.py
 %%PYTHON_LIBDIR%%/test/test_sort.py
 %%PYTHON_LIBDIR%%/test/test_sqlite.py
+%%PYTHON_LIBDIR%%/test/test_ssl.py
 %%PYTHON_LIBDIR%%/test/test_startfile.py
 %%PYTHON_LIBDIR%%/test/test_str.py
 %%PYTHON_LIBDIR%%/test/test_strftime.py
@@ -1319,6 +1488,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_sys.py
 %%PYTHON_LIBDIR%%/test/test_tarfile.py
 %%PYTHON_LIBDIR%%/test/test_tcl.py
+%%PYTHON_LIBDIR%%/test/test_telnetlib.py
 %%PYTHON_LIBDIR%%/test/test_tempfile.py
 %%PYTHON_LIBDIR%%/test/test_textwrap.py
 %%PYTHON_LIBDIR%%/test/test_thread.py
@@ -1334,9 +1504,11 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/test_traceback.py
 %%PYTHON_LIBDIR%%/test/test_transformer.py
 %%PYTHON_LIBDIR%%/test/test_tuple.py
+%%PYTHON_LIBDIR%%/test/test_typechecks.py
 %%PYTHON_LIBDIR%%/test/test_types.py
 %%PYTHON_LIBDIR%%/test/test_ucn.py
 %%PYTHON_LIBDIR%%/test/test_unary.py
+%%PYTHON_LIBDIR%%/test/test_undocumented_details.py
 %%PYTHON_LIBDIR%%/test/test_unicode.py
 %%PYTHON_LIBDIR%%/test/test_unicode_file.py
 %%PYTHON_LIBDIR%%/test/test_unicodedata.py
@@ -1385,6 +1557,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/test/threaded_import_hangers.py
 %%PYTHON_LIBDIR%%/test/time_hashlib.py
 %%PYTHON_LIBDIR%%/test/tokenize_tests.txt
+%%PYTHON_LIBDIR%%/test/warning_tests.py
+%%PYTHON_LIBDIR%%/test/wrongcert.pem
 %%PYTHON_LIBDIR%%/test/xmltests.py
 %%PYTHON_LIBDIR%%/textwrap.py
 %%PYTHON_LIBDIR%%/this.py
@@ -1454,7 +1628,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Dbm.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/README
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Range.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Rat.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Rev.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/Vec.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/classes/bitvec.py
@@ -1625,6 +1798,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/MimeViewer.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/ShellWindow.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/brownian.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/brownian2.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/canvasevents.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/dialog.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/guido/electrons.py
@@ -1681,6 +1855,27 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/matt/window-creation-more.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/matt/window-creation-simple.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tkinter/matt/window-creation-w-location.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/about_turtle.txt
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/about_turtledemo.txt
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/demohelp.txt
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_I_dontlike_tiltdemo.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_bytedesign.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_chaos.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_clock.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_colormixer.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_fractalcurves.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_lindenmayer_indian.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_minimal_hanoi.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_paint.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_peace.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_penrose.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_planet_and_moon.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_tree.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_wikipedia.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/tdemo_yinyang.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/turtle.cfg
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/turtleDemo.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/turtle/turtledemo_two_canvases.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/xml/elem_count.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/xml/roundtrip.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/xml/rss2html.py
@@ -1704,15 +1899,16 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenVariable.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/Makefile
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/README.tcltk-AMD64
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/build-amd64.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/build.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/buildmsi.bat
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/clean-amd64.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/clean.bat
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/external-amd64.bat
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/external-common.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/external.bat
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/getchm.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.bat
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.c
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/kill_python.mak
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/test-amd64.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/buildbot/test.bat
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/compiler/ACKS
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/compiler/README
@@ -1787,6 +1983,8 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/crtlicense.txt
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/merge.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c
@@ -1813,6 +2011,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/Strings.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/Tuples.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/Unicode.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/With.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/clockres.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/package/__init__.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pybench/package/submodule.py
@@ -1839,6 +2038,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/pynche.pyw
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/webcolors.txt
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/websafe.txt
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/2to3
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/README
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/byext.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/byteyears.py
@@ -1882,6 +2082,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/objgraph.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/parseentities.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/patchcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/pickle2db.py
@@ -1894,6 +2095,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/setup.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/smtpd.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/svneol.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
@@ -1901,7 +2103,9 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/win_add2path.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/xxci.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/ssl/get-remote-certificate.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/unicode/Makefile
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/unicode/comparecodecs.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/unicode/gencjkcodecs.py
@@ -1930,6 +2134,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/versioncheck
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/unicode/python-mappings
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/unicode
+%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/ssl
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche
@@ -1952,6 +2157,7 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml
+%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/turtle
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/tkinter/matt
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/tkinter/guido
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/tkinter
@@ -1981,7 +2187,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 @dirrm %%PYTHON_LIBDIR%%/xml/dom
 @dirrm %%PYTHON_LIBDIR%%/xml
 @dirrm %%PYTHON_LIBDIR%%/wsgiref
-@dirrm %%PYTHON_LIBDIR%%/test/output
 @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata
 @dirrm %%PYTHON_LIBDIR%%/test
 @dirrm %%PYTHON_LIBDIR%%/sqlite3/test
@@ -1992,9 +2197,18 @@ lib/lib%%PYTHON_VERSION%%.so.1
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd6
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd5
 @dirrm %%PYTHON_LIBDIR%%/plat-freebsd4
+@dirrm %%PYTHON_LIBDIR%%/multiprocessing/dummy
+@dirrm %%PYTHON_LIBDIR%%/multiprocessing
 @dirrm %%PYTHON_LIBDIR%%/logging
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/tests
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/pgen2
+@dirrm %%PYTHON_LIBDIR%%/lib2to3/fixes
+@dirrm %%PYTHON_LIBDIR%%/lib2to3
 @dirrm %%PYTHON_LIBDIR%%/lib-tk
+@dirrm %%PYTHON_LIBDIR%%/lib-old
 @dirrm %%PYTHON_LIBDIR%%/lib-dynload
+@dirrm %%PYTHON_LIBDIR%%/json/tests
+@dirrm %%PYTHON_LIBDIR%%/json
 @dirrm %%PYTHON_LIBDIR%%/idlelib/Icons
 @dirrm %%PYTHON_LIBDIR%%/idlelib
 @dirrm %%PYTHON_LIBDIR%%/hotshot