1 files changed, 313 insertions, 37 deletions

diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index a8d752d69a4b..e5c240cebb72 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -6,6 +6,8 @@ bin/python
 bin/python%%PYVER%%
 bin/python-shared
 bin/python-shared%%PYVER%%
+bin/smtpd%%PYVER%%.py
+bin/smtpd.py
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -29,6 +31,7 @@ include/%%PYTHON_VERSION%%/fileobject.h
 include/%%PYTHON_VERSION%%/floatobject.h
 include/%%PYTHON_VERSION%%/frameobject.h
 include/%%PYTHON_VERSION%%/funcobject.h
+include/%%PYTHON_VERSION%%/genobject.h
 include/%%PYTHON_VERSION%%/graminit.h
 include/%%PYTHON_VERSION%%/grammar.h
 include/%%PYTHON_VERSION%%/import.h
@@ -62,15 +65,18 @@ include/%%PYTHON_VERSION%%/pymactoolbox.h
 include/%%PYTHON_VERSION%%/pymem.h
 include/%%PYTHON_VERSION%%/pyport.h
 include/%%PYTHON_VERSION%%/pystate.h
+include/%%PYTHON_VERSION%%/pystrtod.h
 include/%%PYTHON_VERSION%%/pythonrun.h
 include/%%PYTHON_VERSION%%/pythread.h
 include/%%PYTHON_VERSION%%/rangeobject.h
+include/%%PYTHON_VERSION%%/setobject.h
 include/%%PYTHON_VERSION%%/sliceobject.h
 include/%%PYTHON_VERSION%%/stringobject.h
 include/%%PYTHON_VERSION%%/structmember.h
 include/%%PYTHON_VERSION%%/structseq.h
 include/%%PYTHON_VERSION%%/symtable.h
 include/%%PYTHON_VERSION%%/sysmodule.h
+include/%%PYTHON_VERSION%%/timefuncs.h
 include/%%PYTHON_VERSION%%/token.h
 include/%%PYTHON_VERSION%%/traceback.h
 include/%%PYTHON_VERSION%%/tupleobject.h
@@ -97,9 +103,6 @@ lib/%%PYTHON_VERSION%%/Cookie.pyo
 lib/%%PYTHON_VERSION%%/DocXMLRPCServer.py
 lib/%%PYTHON_VERSION%%/DocXMLRPCServer.pyc
 lib/%%PYTHON_VERSION%%/DocXMLRPCServer.pyo
-lib/%%PYTHON_VERSION%%/FCNTL.py
-lib/%%PYTHON_VERSION%%/FCNTL.pyc
-lib/%%PYTHON_VERSION%%/FCNTL.pyo
 lib/%%PYTHON_VERSION%%/HTMLParser.py
 lib/%%PYTHON_VERSION%%/HTMLParser.pyc
 lib/%%PYTHON_VERSION%%/HTMLParser.pyo
@@ -122,9 +125,6 @@ lib/%%PYTHON_VERSION%%/SocketServer.pyo
 lib/%%PYTHON_VERSION%%/StringIO.py
 lib/%%PYTHON_VERSION%%/StringIO.pyc
 lib/%%PYTHON_VERSION%%/StringIO.pyo
-lib/%%PYTHON_VERSION%%/TERMIOS.py
-lib/%%PYTHON_VERSION%%/TERMIOS.pyc
-lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 lib/%%PYTHON_VERSION%%/UserDict.py
 lib/%%PYTHON_VERSION%%/UserDict.pyc
 lib/%%PYTHON_VERSION%%/UserDict.pyo
@@ -134,6 +134,12 @@ lib/%%PYTHON_VERSION%%/UserList.pyo
 lib/%%PYTHON_VERSION%%/UserString.py
 lib/%%PYTHON_VERSION%%/UserString.pyc
 lib/%%PYTHON_VERSION%%/UserString.pyo
+lib/%%PYTHON_VERSION%%/_LWPCookieJar.py
+lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyc
+lib/%%PYTHON_VERSION%%/_LWPCookieJar.pyo
+lib/%%PYTHON_VERSION%%/_MozillaCookieJar.py
+lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyc
+lib/%%PYTHON_VERSION%%/_MozillaCookieJar.pyo
 lib/%%PYTHON_VERSION%%/__future__.py
 lib/%%PYTHON_VERSION%%/__future__.pyc
 lib/%%PYTHON_VERSION%%/__future__.pyo
@@ -143,6 +149,9 @@ lib/%%PYTHON_VERSION%%/__phello__.foo.pyo
 lib/%%PYTHON_VERSION%%/_strptime.py
 lib/%%PYTHON_VERSION%%/_strptime.pyc
 lib/%%PYTHON_VERSION%%/_strptime.pyo
+lib/%%PYTHON_VERSION%%/_threading_local.py
+lib/%%PYTHON_VERSION%%/_threading_local.pyc
+lib/%%PYTHON_VERSION%%/_threading_local.pyo
 lib/%%PYTHON_VERSION%%/aifc.py
 lib/%%PYTHON_VERSION%%/aifc.pyc
 lib/%%PYTHON_VERSION%%/aifc.pyo
@@ -319,6 +328,9 @@ lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a
 lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.so
 lib/%%PYTHON_VERSION%%/config/makesetup
 lib/%%PYTHON_VERSION%%/config/python.o
+lib/%%PYTHON_VERSION%%/cookielib.py
+lib/%%PYTHON_VERSION%%/cookielib.pyc
+lib/%%PYTHON_VERSION%%/cookielib.pyo
 lib/%%PYTHON_VERSION%%/copy.py
 lib/%%PYTHON_VERSION%%/copy.pyc
 lib/%%PYTHON_VERSION%%/copy.pyo
@@ -349,6 +361,9 @@ lib/%%PYTHON_VERSION%%/curses/wrapper.pyo
 lib/%%PYTHON_VERSION%%/dbhash.py
 lib/%%PYTHON_VERSION%%/dbhash.pyc
 lib/%%PYTHON_VERSION%%/dbhash.pyo
+lib/%%PYTHON_VERSION%%/decimal.py
+lib/%%PYTHON_VERSION%%/decimal.pyc
+lib/%%PYTHON_VERSION%%/decimal.pyo
 lib/%%PYTHON_VERSION%%/difflib.py
 lib/%%PYTHON_VERSION%%/difflib.pyc
 lib/%%PYTHON_VERSION%%/difflib.pyo
@@ -432,7 +447,8 @@ lib/%%PYTHON_VERSION%%/distutils/command/register.pyo
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.py
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyc
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyo
-lib/%%PYTHON_VERSION%%/distutils/command/wininst.exe
+lib/%%PYTHON_VERSION%%/distutils/command/wininst-6.exe
+lib/%%PYTHON_VERSION%%/distutils/command/wininst-7.1.exe
 lib/%%PYTHON_VERSION%%/distutils/core.py
 lib/%%PYTHON_VERSION%%/distutils/core.pyc
 lib/%%PYTHON_VERSION%%/distutils/core.pyo
@@ -517,6 +533,9 @@ lib/%%PYTHON_VERSION%%/email/Encoders.pyo
 lib/%%PYTHON_VERSION%%/email/Errors.py
 lib/%%PYTHON_VERSION%%/email/Errors.pyc
 lib/%%PYTHON_VERSION%%/email/Errors.pyo
+lib/%%PYTHON_VERSION%%/email/FeedParser.py
+lib/%%PYTHON_VERSION%%/email/FeedParser.pyc
+lib/%%PYTHON_VERSION%%/email/FeedParser.pyo
 lib/%%PYTHON_VERSION%%/email/Generator.py
 lib/%%PYTHON_VERSION%%/email/Generator.pyc
 lib/%%PYTHON_VERSION%%/email/Generator.pyo
@@ -559,12 +578,6 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
 lib/%%PYTHON_VERSION%%/email/__init__.py
 lib/%%PYTHON_VERSION%%/email/__init__.pyc
 lib/%%PYTHON_VERSION%%/email/__init__.pyo
-lib/%%PYTHON_VERSION%%/email/_compat21.py
-lib/%%PYTHON_VERSION%%/email/_compat21.pyc
-lib/%%PYTHON_VERSION%%/email/_compat21.pyo
-lib/%%PYTHON_VERSION%%/email/_compat22.py
-lib/%%PYTHON_VERSION%%/email/_compat22.pyc
-lib/%%PYTHON_VERSION%%/email/_compat22.pyo
 lib/%%PYTHON_VERSION%%/email/_parseaddr.py
 lib/%%PYTHON_VERSION%%/email/_parseaddr.pyc
 lib/%%PYTHON_VERSION%%/email/_parseaddr.pyo
@@ -591,6 +604,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_09.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_10.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_11.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_12.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_12a.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_13.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
@@ -614,7 +628,13 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_32.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_36.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_37.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_38.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_39.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_42.txt
 lib/%%PYTHON_VERSION%%/email/test/test_email.py
 lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
 lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
@@ -636,6 +656,15 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.py
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo
+lib/%%PYTHON_VERSION%%/encodings/big5.py
+lib/%%PYTHON_VERSION%%/encodings/big5.pyc
+lib/%%PYTHON_VERSION%%/encodings/big5.pyo
+lib/%%PYTHON_VERSION%%/encodings/big5hkscs.py
+lib/%%PYTHON_VERSION%%/encodings/big5hkscs.pyc
+lib/%%PYTHON_VERSION%%/encodings/big5hkscs.pyo
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo
 lib/%%PYTHON_VERSION%%/encodings/charmap.py
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyc
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyo
@@ -738,18 +767,78 @@ lib/%%PYTHON_VERSION%%/encodings/cp874.pyo
 lib/%%PYTHON_VERSION%%/encodings/cp875.py
 lib/%%PYTHON_VERSION%%/encodings/cp875.pyc
 lib/%%PYTHON_VERSION%%/encodings/cp875.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp932.py
+lib/%%PYTHON_VERSION%%/encodings/cp932.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp932.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp949.py
+lib/%%PYTHON_VERSION%%/encodings/cp949.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp949.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp950.py
+lib/%%PYTHON_VERSION%%/encodings/cp950.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp950.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_jis_2004.py
+lib/%%PYTHON_VERSION%%/encodings/euc_jis_2004.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_jis_2004.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.py
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.py
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.py
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.pyo
+lib/%%PYTHON_VERSION%%/encodings/gb18030.py
+lib/%%PYTHON_VERSION%%/encodings/gb18030.pyc
+lib/%%PYTHON_VERSION%%/encodings/gb18030.pyo
+lib/%%PYTHON_VERSION%%/encodings/gb2312.py
+lib/%%PYTHON_VERSION%%/encodings/gb2312.pyc
+lib/%%PYTHON_VERSION%%/encodings/gb2312.pyo
+lib/%%PYTHON_VERSION%%/encodings/gbk.py
+lib/%%PYTHON_VERSION%%/encodings/gbk.pyc
+lib/%%PYTHON_VERSION%%/encodings/gbk.pyo
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.py
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyo
+lib/%%PYTHON_VERSION%%/encodings/hp_roman8.py
+lib/%%PYTHON_VERSION%%/encodings/hp_roman8.pyc
+lib/%%PYTHON_VERSION%%/encodings/hp_roman8.pyo
+lib/%%PYTHON_VERSION%%/encodings/hz.py
+lib/%%PYTHON_VERSION%%/encodings/hz.pyc
+lib/%%PYTHON_VERSION%%/encodings/hz.pyo
 lib/%%PYTHON_VERSION%%/encodings/idna.py
 lib/%%PYTHON_VERSION%%/encodings/idna.pyc
 lib/%%PYTHON_VERSION%%/encodings/idna.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2004.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2004.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2004.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_10.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_10.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso8859_11.py
+lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso8859_11.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_13.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_13.pyo
@@ -759,6 +848,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_14.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_15.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_15.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso8859_16.py
+lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso8859_16.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_2.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_2.pyo
@@ -783,6 +875,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_8.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
+lib/%%PYTHON_VERSION%%/encodings/johab.py
+lib/%%PYTHON_VERSION%%/encodings/johab.pyc
+lib/%%PYTHON_VERSION%%/encodings/johab.pyo
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
@@ -816,6 +911,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo
 lib/%%PYTHON_VERSION%%/encodings/palmos.py
 lib/%%PYTHON_VERSION%%/encodings/palmos.pyc
 lib/%%PYTHON_VERSION%%/encodings/palmos.pyo
+lib/%%PYTHON_VERSION%%/encodings/ptcp154.py
+lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyc
+lib/%%PYTHON_VERSION%%/encodings/ptcp154.pyo
 lib/%%PYTHON_VERSION%%/encodings/punycode.py
 lib/%%PYTHON_VERSION%%/encodings/punycode.pyc
 lib/%%PYTHON_VERSION%%/encodings/punycode.pyo
@@ -828,9 +926,21 @@ lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo
 lib/%%PYTHON_VERSION%%/encodings/rot_13.py
 lib/%%PYTHON_VERSION%%/encodings/rot_13.pyc
 lib/%%PYTHON_VERSION%%/encodings/rot_13.pyo
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.py
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.pyc
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.pyo
+lib/%%PYTHON_VERSION%%/encodings/shift_jis_2004.py
+lib/%%PYTHON_VERSION%%/encodings/shift_jis_2004.pyc
+lib/%%PYTHON_VERSION%%/encodings/shift_jis_2004.pyo
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.py
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyc
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo
 lib/%%PYTHON_VERSION%%/encodings/string_escape.py
 lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc
 lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo
+lib/%%PYTHON_VERSION%%/encodings/tis_620.py
+lib/%%PYTHON_VERSION%%/encodings/tis_620.pyc
+lib/%%PYTHON_VERSION%%/encodings/tis_620.pyo
 lib/%%PYTHON_VERSION%%/encodings/undefined.py
 lib/%%PYTHON_VERSION%%/encodings/undefined.pyc
 lib/%%PYTHON_VERSION%%/encodings/undefined.pyo
@@ -941,6 +1051,9 @@ lib/%%PYTHON_VERSION%%/idlelib/ChangeLog
 lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.py
 lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyc
 lib/%%PYTHON_VERSION%%/idlelib/ClassBrowser.pyo
+lib/%%PYTHON_VERSION%%/idlelib/CodeContext.py
+lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyc
+lib/%%PYTHON_VERSION%%/idlelib/CodeContext.pyo
 lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.py
 lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyc
 lib/%%PYTHON_VERSION%%/idlelib/ColorDelegator.pyo
@@ -1078,7 +1191,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc
 lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo
 lib/%%PYTHON_VERSION%%/idlelib/extend.txt
 lib/%%PYTHON_VERSION%%/idlelib/help.txt
-lib/%%PYTHON_VERSION%%/idlelib/idle
 lib/%%PYTHON_VERSION%%/idlelib/idle.bat
 lib/%%PYTHON_VERSION%%/idlelib/idle.py
 lib/%%PYTHON_VERSION%%/idlelib/idle.pyc
@@ -1123,11 +1235,20 @@ lib/%%PYTHON_VERSION%%/inspect.pyo
 lib/%%PYTHON_VERSION%%/keyword.py
 lib/%%PYTHON_VERSION%%/keyword.pyc
 lib/%%PYTHON_VERSION%%/keyword.pyo
+lib/%%PYTHON_VERSION%%/lib-dynload/_bisect.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_cn.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_hk.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_jp.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_kr.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_tw.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_heapq.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_random.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_ssl.so
@@ -1141,6 +1262,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/bz2.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
+lib/%%PYTHON_VERSION%%/lib-dynload/collections.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
@@ -1154,16 +1276,14 @@ lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so
 lib/%%PYTHON_VERSION%%/lib-dynload/parser.so
-lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so
 lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
 lib/%%PYTHON_VERSION%%/lib-dynload/strop.so
@@ -1173,7 +1293,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/termios.so
 lib/%%PYTHON_VERSION%%/lib-dynload/time.so
 lib/%%PYTHON_VERSION%%/lib-dynload/timing.so
 lib/%%PYTHON_VERSION%%/lib-dynload/unicodedata.so
-lib/%%PYTHON_VERSION%%/lib-dynload/xreadlines.so
 lib/%%PYTHON_VERSION%%/lib-dynload/zlib.so
 lib/%%PYTHON_VERSION%%/lib-old/Para.py
 lib/%%PYTHON_VERSION%%/lib-old/Para.pyc
@@ -1414,9 +1533,6 @@ lib/%%PYTHON_VERSION%%/posixpath.pyo
 lib/%%PYTHON_VERSION%%/pprint.py
 lib/%%PYTHON_VERSION%%/pprint.pyc
 lib/%%PYTHON_VERSION%%/pprint.pyo
-lib/%%PYTHON_VERSION%%/pre.py
-lib/%%PYTHON_VERSION%%/pre.pyc
-lib/%%PYTHON_VERSION%%/pre.pyo
 lib/%%PYTHON_VERSION%%/profile.doc
 lib/%%PYTHON_VERSION%%/profile.py
 lib/%%PYTHON_VERSION%%/profile.pyc
@@ -1533,6 +1649,9 @@ lib/%%PYTHON_VERSION%%/stringold.pyo
 lib/%%PYTHON_VERSION%%/stringprep.py
 lib/%%PYTHON_VERSION%%/stringprep.pyc
 lib/%%PYTHON_VERSION%%/stringprep.pyo
+lib/%%PYTHON_VERSION%%/subprocess.py
+lib/%%PYTHON_VERSION%%/subprocess.pyc
+lib/%%PYTHON_VERSION%%/subprocess.pyo
 lib/%%PYTHON_VERSION%%/sunau.py
 lib/%%PYTHON_VERSION%%/sunau.pyc
 lib/%%PYTHON_VERSION%%/sunau.pyo
@@ -1571,11 +1690,56 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future4.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_future5.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_future6.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py
+lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py
+lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py
+lib/%%PYTHON_VERSION%%/test/cfgparser.1
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/abs.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/add.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/base.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/clamp.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/compare.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal128.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal32.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/decimal64.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/divide.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/divideint.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/inexact.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/max.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/min.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/minus.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/multiply.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/normalize.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/plus.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/power.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/quantize.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/randomBound32.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/randoms.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/remainder.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/remainderNear.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/rescale.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/rounding.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/samequantum.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/squareroot.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/subtract.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/testall.decTest
+lib/%%PYTHON_VERSION%%/test/decimaltestdata/tointegral.decTest
+lib/%%PYTHON_VERSION%%/test/doctest_aliases.py
+lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyc
+lib/%%PYTHON_VERSION%%/test/doctest_aliases.pyo
 lib/%%PYTHON_VERSION%%/test/double_const.py
 lib/%%PYTHON_VERSION%%/test/double_const.pyc
 lib/%%PYTHON_VERSION%%/test/double_const.pyo
 lib/%%PYTHON_VERSION%%/test/greyrgb.uue
+lib/%%PYTHON_VERSION%%/test/list_tests.py
+lib/%%PYTHON_VERSION%%/test/list_tests.pyc
+lib/%%PYTHON_VERSION%%/test/list_tests.pyo
+lib/%%PYTHON_VERSION%%/test/mapping_tests.py
+lib/%%PYTHON_VERSION%%/test/mapping_tests.pyc
+lib/%%PYTHON_VERSION%%/test/mapping_tests.pyo
 lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
 lib/%%PYTHON_VERSION%%/test/output/test_asynchat
 lib/%%PYTHON_VERSION%%/test/output/test_augassign
@@ -1587,15 +1751,12 @@ lib/%%PYTHON_VERSION%%/test/output/test_cookie
 lib/%%PYTHON_VERSION%%/test/output/test_exceptions
 lib/%%PYTHON_VERSION%%/test/output/test_extcall
 lib/%%PYTHON_VERSION%%/test/output/test_frozen
-lib/%%PYTHON_VERSION%%/test/output/test_future
 lib/%%PYTHON_VERSION%%/test/output/test_global
 lib/%%PYTHON_VERSION%%/test/output/test_grammar
 lib/%%PYTHON_VERSION%%/test/output/test_httplib
 lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev
 lib/%%PYTHON_VERSION%%/test/output/test_logging
-lib/%%PYTHON_VERSION%%/test/output/test_longexp
 lib/%%PYTHON_VERSION%%/test/output/test_math
-lib/%%PYTHON_VERSION%%/test/output/test_md5
 lib/%%PYTHON_VERSION%%/test/output/test_mmap
 lib/%%PYTHON_VERSION%%/test/output/test_new
 lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1614,20 +1775,20 @@ lib/%%PYTHON_VERSION%%/test/output/test_pyexpat
 lib/%%PYTHON_VERSION%%/test/output/test_regex
 lib/%%PYTHON_VERSION%%/test/output/test_resource
 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg
-lib/%%PYTHON_VERSION%%/test/output/test_rotor
 lib/%%PYTHON_VERSION%%/test/output/test_scope
 lib/%%PYTHON_VERSION%%/test/output/test_signal
 lib/%%PYTHON_VERSION%%/test/output/test_thread
 lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile
 lib/%%PYTHON_VERSION%%/test/output/test_tokenize
 lib/%%PYTHON_VERSION%%/test/output/test_types
-lib/%%PYTHON_VERSION%%/test/output/test_unicode_file
 lib/%%PYTHON_VERSION%%/test/output/test_winreg
-lib/%%PYTHON_VERSION%%/test/output/test_xreadline
 lib/%%PYTHON_VERSION%%/test/output/xmltests
 lib/%%PYTHON_VERSION%%/test/pickletester.py
 lib/%%PYTHON_VERSION%%/test/pickletester.pyc
 lib/%%PYTHON_VERSION%%/test/pickletester.pyo
+lib/%%PYTHON_VERSION%%/test/pyclbr_input.py
+lib/%%PYTHON_VERSION%%/test/pyclbr_input.pyc
+lib/%%PYTHON_VERSION%%/test/pyclbr_input.pyo
 lib/%%PYTHON_VERSION%%/test/pydocfodder.py
 lib/%%PYTHON_VERSION%%/test/pydocfodder.pyc
 lib/%%PYTHON_VERSION%%/test/pydocfodder.pyo
@@ -1646,6 +1807,12 @@ lib/%%PYTHON_VERSION%%/test/regrtest.pyo
 lib/%%PYTHON_VERSION%%/test/reperf.py
 lib/%%PYTHON_VERSION%%/test/reperf.pyc
 lib/%%PYTHON_VERSION%%/test/reperf.pyo
+lib/%%PYTHON_VERSION%%/test/sample_doctest.py
+lib/%%PYTHON_VERSION%%/test/sample_doctest.pyc
+lib/%%PYTHON_VERSION%%/test/sample_doctest.pyo
+lib/%%PYTHON_VERSION%%/test/seq_tests.py
+lib/%%PYTHON_VERSION%%/test/seq_tests.pyc
+lib/%%PYTHON_VERSION%%/test/seq_tests.pyo
 lib/%%PYTHON_VERSION%%/test/sortperf.py
 lib/%%PYTHON_VERSION%%/test/sortperf.pyc
 lib/%%PYTHON_VERSION%%/test/sortperf.pyo
@@ -1666,6 +1833,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo
 lib/%%PYTHON_VERSION%%/test/test___future__.py
 lib/%%PYTHON_VERSION%%/test/test___future__.pyc
 lib/%%PYTHON_VERSION%%/test/test___future__.pyo
+lib/%%PYTHON_VERSION%%/test/test__locale.py
+lib/%%PYTHON_VERSION%%/test/test__locale.pyc
+lib/%%PYTHON_VERSION%%/test/test__locale.pyo
 lib/%%PYTHON_VERSION%%/test/test_aepack.py
 lib/%%PYTHON_VERSION%%/test/test_aepack.pyc
 lib/%%PYTHON_VERSION%%/test/test_aepack.pyo
@@ -1675,6 +1845,9 @@ lib/%%PYTHON_VERSION%%/test/test_al.pyo
 lib/%%PYTHON_VERSION%%/test/test_anydbm.py
 lib/%%PYTHON_VERSION%%/test/test_anydbm.pyc
 lib/%%PYTHON_VERSION%%/test/test_anydbm.pyo
+lib/%%PYTHON_VERSION%%/test/test_applesingle.py
+lib/%%PYTHON_VERSION%%/test/test_applesingle.pyc
+lib/%%PYTHON_VERSION%%/test/test_applesingle.pyo
 lib/%%PYTHON_VERSION%%/test/test_array.py
 lib/%%PYTHON_VERSION%%/test/test_array.pyc
 lib/%%PYTHON_VERSION%%/test/test_array.pyo
@@ -1762,6 +1935,36 @@ lib/%%PYTHON_VERSION%%/test/test_cmath.pyo
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.py
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.pyc
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_hk.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_hk.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_hk.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_hk.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_hk.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_hk.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.pyo
 lib/%%PYTHON_VERSION%%/test/test_codecs.py
 lib/%%PYTHON_VERSION%%/test/test_codecs.pyc
 lib/%%PYTHON_VERSION%%/test/test_codecs.pyo
@@ -1771,6 +1974,9 @@ lib/%%PYTHON_VERSION%%/test/test_codeop.pyo
 lib/%%PYTHON_VERSION%%/test/test_coercion.py
 lib/%%PYTHON_VERSION%%/test/test_coercion.pyc
 lib/%%PYTHON_VERSION%%/test/test_coercion.pyo
+lib/%%PYTHON_VERSION%%/test/test_colorsys.py
+lib/%%PYTHON_VERSION%%/test/test_colorsys.pyc
+lib/%%PYTHON_VERSION%%/test/test_colorsys.pyo
 lib/%%PYTHON_VERSION%%/test/test_commands.py
 lib/%%PYTHON_VERSION%%/test/test_commands.pyc
 lib/%%PYTHON_VERSION%%/test/test_commands.pyo
@@ -1780,6 +1986,9 @@ lib/%%PYTHON_VERSION%%/test/test_compare.pyo
 lib/%%PYTHON_VERSION%%/test/test_compile.py
 lib/%%PYTHON_VERSION%%/test/test_compile.pyc
 lib/%%PYTHON_VERSION%%/test/test_compile.pyo
+lib/%%PYTHON_VERSION%%/test/test_compiler.py
+lib/%%PYTHON_VERSION%%/test/test_compiler.pyc
+lib/%%PYTHON_VERSION%%/test/test_compiler.pyo
 lib/%%PYTHON_VERSION%%/test/test_complex.py
 lib/%%PYTHON_VERSION%%/test/test_complex.pyc
 lib/%%PYTHON_VERSION%%/test/test_complex.pyo
@@ -1789,6 +1998,9 @@ lib/%%PYTHON_VERSION%%/test/test_contains.pyo
 lib/%%PYTHON_VERSION%%/test/test_cookie.py
 lib/%%PYTHON_VERSION%%/test/test_cookie.pyc
 lib/%%PYTHON_VERSION%%/test/test_cookie.pyo
+lib/%%PYTHON_VERSION%%/test/test_cookielib.py
+lib/%%PYTHON_VERSION%%/test/test_cookielib.pyc
+lib/%%PYTHON_VERSION%%/test/test_cookielib.pyo
 lib/%%PYTHON_VERSION%%/test/test_copy.py
 lib/%%PYTHON_VERSION%%/test/test_copy.pyc
 lib/%%PYTHON_VERSION%%/test/test_copy.pyo
@@ -1813,30 +2025,48 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo
 lib/%%PYTHON_VERSION%%/test/test_dbm.py
 lib/%%PYTHON_VERSION%%/test/test_dbm.pyc
 lib/%%PYTHON_VERSION%%/test/test_dbm.pyo
+lib/%%PYTHON_VERSION%%/test/test_decimal.py
+lib/%%PYTHON_VERSION%%/test/test_decimal.pyc
+lib/%%PYTHON_VERSION%%/test/test_decimal.pyo
+lib/%%PYTHON_VERSION%%/test/test_decorators.py
+lib/%%PYTHON_VERSION%%/test/test_decorators.pyc
+lib/%%PYTHON_VERSION%%/test/test_decorators.pyo
+lib/%%PYTHON_VERSION%%/test/test_deque.py
+lib/%%PYTHON_VERSION%%/test/test_deque.pyc
+lib/%%PYTHON_VERSION%%/test/test_deque.pyo
 lib/%%PYTHON_VERSION%%/test/test_descr.py
 lib/%%PYTHON_VERSION%%/test/test_descr.pyc
 lib/%%PYTHON_VERSION%%/test/test_descr.pyo
 lib/%%PYTHON_VERSION%%/test/test_descrtut.py
 lib/%%PYTHON_VERSION%%/test/test_descrtut.pyc
 lib/%%PYTHON_VERSION%%/test/test_descrtut.pyo
+lib/%%PYTHON_VERSION%%/test/test_dict.py
+lib/%%PYTHON_VERSION%%/test/test_dict.pyc
+lib/%%PYTHON_VERSION%%/test/test_dict.pyo
 lib/%%PYTHON_VERSION%%/test/test_difflib.py
 lib/%%PYTHON_VERSION%%/test/test_difflib.pyc
 lib/%%PYTHON_VERSION%%/test/test_difflib.pyo
+lib/%%PYTHON_VERSION%%/test/test_difflib_expect.html
 lib/%%PYTHON_VERSION%%/test/test_dircache.py
 lib/%%PYTHON_VERSION%%/test/test_dircache.pyc
 lib/%%PYTHON_VERSION%%/test/test_dircache.pyo
 lib/%%PYTHON_VERSION%%/test/test_dis.py
 lib/%%PYTHON_VERSION%%/test/test_dis.pyc
 lib/%%PYTHON_VERSION%%/test/test_dis.pyo
+lib/%%PYTHON_VERSION%%/test/test_distutils.py
+lib/%%PYTHON_VERSION%%/test/test_distutils.pyc
+lib/%%PYTHON_VERSION%%/test/test_distutils.pyo
 lib/%%PYTHON_VERSION%%/test/test_dl.py
 lib/%%PYTHON_VERSION%%/test/test_dl.pyc
 lib/%%PYTHON_VERSION%%/test/test_dl.pyo
 lib/%%PYTHON_VERSION%%/test/test_doctest.py
 lib/%%PYTHON_VERSION%%/test/test_doctest.pyc
 lib/%%PYTHON_VERSION%%/test/test_doctest.pyo
+lib/%%PYTHON_VERSION%%/test/test_doctest.txt
 lib/%%PYTHON_VERSION%%/test/test_doctest2.py
 lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc
 lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo
+lib/%%PYTHON_VERSION%%/test/test_doctest2.txt
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
@@ -1918,6 +2148,9 @@ lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo
 lib/%%PYTHON_VERSION%%/test/test_generators.py
 lib/%%PYTHON_VERSION%%/test/test_generators.pyc
 lib/%%PYTHON_VERSION%%/test/test_generators.pyo
+lib/%%PYTHON_VERSION%%/test/test_genexps.py
+lib/%%PYTHON_VERSION%%/test/test_genexps.pyc
+lib/%%PYTHON_VERSION%%/test/test_genexps.pyo
 lib/%%PYTHON_VERSION%%/test/test_getargs.py
 lib/%%PYTHON_VERSION%%/test/test_getargs.pyc
 lib/%%PYTHON_VERSION%%/test/test_getargs.pyo
@@ -2002,6 +2235,9 @@ lib/%%PYTHON_VERSION%%/test/test_isinstance.pyo
 lib/%%PYTHON_VERSION%%/test/test_iter.py
 lib/%%PYTHON_VERSION%%/test/test_iter.pyc
 lib/%%PYTHON_VERSION%%/test/test_iter.pyo
+lib/%%PYTHON_VERSION%%/test/test_iterlen.py
+lib/%%PYTHON_VERSION%%/test/test_iterlen.pyc
+lib/%%PYTHON_VERSION%%/test/test_iterlen.pyo
 lib/%%PYTHON_VERSION%%/test/test_itertools.py
 lib/%%PYTHON_VERSION%%/test/test_itertools.pyc
 lib/%%PYTHON_VERSION%%/test/test_itertools.pyo
@@ -2011,6 +2247,9 @@ lib/%%PYTHON_VERSION%%/test/test_largefile.pyo
 lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py
 lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc
 lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo
+lib/%%PYTHON_VERSION%%/test/test_list.py
+lib/%%PYTHON_VERSION%%/test/test_list.pyc
+lib/%%PYTHON_VERSION%%/test/test_list.pyo
 lib/%%PYTHON_VERSION%%/test/test_locale.py
 lib/%%PYTHON_VERSION%%/test/test_locale.pyc
 lib/%%PYTHON_VERSION%%/test/test_locale.pyo
@@ -2065,9 +2304,12 @@ lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
 lib/%%PYTHON_VERSION%%/test/test_module.py
 lib/%%PYTHON_VERSION%%/test/test_module.pyc
 lib/%%PYTHON_VERSION%%/test/test_module.pyo
-lib/%%PYTHON_VERSION%%/test/test_mpz.py
-lib/%%PYTHON_VERSION%%/test/test_mpz.pyc
-lib/%%PYTHON_VERSION%%/test/test_mpz.pyo
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.py
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.pyc
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.pyo
 lib/%%PYTHON_VERSION%%/test/test_multifile.py
 lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
 lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
@@ -2113,6 +2355,9 @@ lib/%%PYTHON_VERSION%%/test/test_ossaudiodev.pyo
 lib/%%PYTHON_VERSION%%/test/test_parser.py
 lib/%%PYTHON_VERSION%%/test/test_parser.pyc
 lib/%%PYTHON_VERSION%%/test/test_parser.pyo
+lib/%%PYTHON_VERSION%%/test/test_peepholer.py
+lib/%%PYTHON_VERSION%%/test/test_peepholer.pyc
+lib/%%PYTHON_VERSION%%/test/test_peepholer.pyo
 lib/%%PYTHON_VERSION%%/test/test_pep247.py
 lib/%%PYTHON_VERSION%%/test/test_pep247.pyc
 lib/%%PYTHON_VERSION%%/test/test_pep247.pyo
@@ -2122,6 +2367,9 @@ lib/%%PYTHON_VERSION%%/test/test_pep263.pyo
 lib/%%PYTHON_VERSION%%/test/test_pep277.py
 lib/%%PYTHON_VERSION%%/test/test_pep277.pyc
 lib/%%PYTHON_VERSION%%/test/test_pep277.pyo
+lib/%%PYTHON_VERSION%%/test/test_pep292.py
+lib/%%PYTHON_VERSION%%/test/test_pep292.pyc
+lib/%%PYTHON_VERSION%%/test/test_pep292.pyo
 lib/%%PYTHON_VERSION%%/test/test_pickle.py
 lib/%%PYTHON_VERSION%%/test/test_pickle.pyc
 lib/%%PYTHON_VERSION%%/test/test_pickle.pyo
@@ -2209,9 +2457,6 @@ lib/%%PYTHON_VERSION%%/test/test_richcmp.pyo
 lib/%%PYTHON_VERSION%%/test/test_robotparser.py
 lib/%%PYTHON_VERSION%%/test/test_robotparser.pyc
 lib/%%PYTHON_VERSION%%/test/test_robotparser.pyo
-lib/%%PYTHON_VERSION%%/test/test_rotor.py
-lib/%%PYTHON_VERSION%%/test/test_rotor.pyc
-lib/%%PYTHON_VERSION%%/test/test_rotor.pyo
 lib/%%PYTHON_VERSION%%/test/test_sax.py
 lib/%%PYTHON_VERSION%%/test/test_sax.pyc
 lib/%%PYTHON_VERSION%%/test/test_sax.pyo
@@ -2224,6 +2469,9 @@ lib/%%PYTHON_VERSION%%/test/test_scriptpackages.pyo
 lib/%%PYTHON_VERSION%%/test/test_select.py
 lib/%%PYTHON_VERSION%%/test/test_select.pyc
 lib/%%PYTHON_VERSION%%/test/test_select.pyo
+lib/%%PYTHON_VERSION%%/test/test_set.py
+lib/%%PYTHON_VERSION%%/test/test_set.pyc
+lib/%%PYTHON_VERSION%%/test/test_set.pyo
 lib/%%PYTHON_VERSION%%/test/test_sets.py
 lib/%%PYTHON_VERSION%%/test/test_sets.pyc
 lib/%%PYTHON_VERSION%%/test/test_sets.pyo
@@ -2245,6 +2493,9 @@ lib/%%PYTHON_VERSION%%/test/test_shutil.pyo
 lib/%%PYTHON_VERSION%%/test/test_signal.py
 lib/%%PYTHON_VERSION%%/test/test_signal.pyc
 lib/%%PYTHON_VERSION%%/test/test_signal.pyo
+lib/%%PYTHON_VERSION%%/test/test_site.py
+lib/%%PYTHON_VERSION%%/test/test_site.pyc
+lib/%%PYTHON_VERSION%%/test/test_site.pyo
 lib/%%PYTHON_VERSION%%/test/test_slice.py
 lib/%%PYTHON_VERSION%%/test/test_slice.pyc
 lib/%%PYTHON_VERSION%%/test/test_slice.pyo
@@ -2287,6 +2538,9 @@ lib/%%PYTHON_VERSION%%/test/test_struct.pyo
 lib/%%PYTHON_VERSION%%/test/test_structseq.py
 lib/%%PYTHON_VERSION%%/test/test_structseq.pyc
 lib/%%PYTHON_VERSION%%/test/test_structseq.pyo
+lib/%%PYTHON_VERSION%%/test/test_subprocess.py
+lib/%%PYTHON_VERSION%%/test/test_subprocess.pyc
+lib/%%PYTHON_VERSION%%/test/test_subprocess.pyo
 lib/%%PYTHON_VERSION%%/test/test_sunaudiodev.py
 lib/%%PYTHON_VERSION%%/test/test_sunaudiodev.pyc
 lib/%%PYTHON_VERSION%%/test/test_sunaudiodev.pyo
@@ -2308,6 +2562,9 @@ lib/%%PYTHON_VERSION%%/test/test_sys.pyo
 lib/%%PYTHON_VERSION%%/test/test_tarfile.py
 lib/%%PYTHON_VERSION%%/test/test_tarfile.pyc
 lib/%%PYTHON_VERSION%%/test/test_tarfile.pyo
+lib/%%PYTHON_VERSION%%/test/test_tcl.py
+lib/%%PYTHON_VERSION%%/test/test_tcl.pyc
+lib/%%PYTHON_VERSION%%/test/test_tcl.pyo
 lib/%%PYTHON_VERSION%%/test/test_tempfile.py
 lib/%%PYTHON_VERSION%%/test/test_tempfile.pyc
 lib/%%PYTHON_VERSION%%/test/test_tempfile.pyo
@@ -2326,6 +2583,12 @@ lib/%%PYTHON_VERSION%%/test/test_threadedtempfile.pyo
 lib/%%PYTHON_VERSION%%/test/test_threading.py
 lib/%%PYTHON_VERSION%%/test/test_threading.pyc
 lib/%%PYTHON_VERSION%%/test/test_threading.pyo
+lib/%%PYTHON_VERSION%%/test/test_threading_local.py
+lib/%%PYTHON_VERSION%%/test/test_threading_local.pyc
+lib/%%PYTHON_VERSION%%/test/test_threading_local.pyo
+lib/%%PYTHON_VERSION%%/test/test_threadsignals.py
+lib/%%PYTHON_VERSION%%/test/test_threadsignals.pyc
+lib/%%PYTHON_VERSION%%/test/test_threadsignals.pyo
 lib/%%PYTHON_VERSION%%/test/test_time.py
 lib/%%PYTHON_VERSION%%/test/test_time.pyc
 lib/%%PYTHON_VERSION%%/test/test_time.pyo
@@ -2344,6 +2607,12 @@ lib/%%PYTHON_VERSION%%/test/test_trace.pyo
 lib/%%PYTHON_VERSION%%/test/test_traceback.py
 lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
 lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
+lib/%%PYTHON_VERSION%%/test/test_transformer.py
+lib/%%PYTHON_VERSION%%/test/test_transformer.pyc
+lib/%%PYTHON_VERSION%%/test/test_transformer.pyo
+lib/%%PYTHON_VERSION%%/test/test_tuple.py
+lib/%%PYTHON_VERSION%%/test/test_tuple.pyc
+lib/%%PYTHON_VERSION%%/test/test_tuple.pyo
 lib/%%PYTHON_VERSION%%/test/test_types.py
 lib/%%PYTHON_VERSION%%/test/test_types.pyc
 lib/%%PYTHON_VERSION%%/test/test_types.pyo
@@ -2362,6 +2631,9 @@ lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyo
 lib/%%PYTHON_VERSION%%/test/test_unicodedata.py
 lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyc
 lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo
+lib/%%PYTHON_VERSION%%/test/test_unittest.py
+lib/%%PYTHON_VERSION%%/test/test_unittest.pyc
+lib/%%PYTHON_VERSION%%/test/test_unittest.pyo
 lib/%%PYTHON_VERSION%%/test/test_univnewlines.py
 lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyc
 lib/%%PYTHON_VERSION%%/test/test_univnewlines.pyo
@@ -2374,6 +2646,9 @@ lib/%%PYTHON_VERSION%%/test/test_urllib.pyo
 lib/%%PYTHON_VERSION%%/test/test_urllib2.py
 lib/%%PYTHON_VERSION%%/test/test_urllib2.pyc
 lib/%%PYTHON_VERSION%%/test/test_urllib2.pyo
+lib/%%PYTHON_VERSION%%/test/test_urllib2net.py
+lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyc
+lib/%%PYTHON_VERSION%%/test/test_urllib2net.pyo
 lib/%%PYTHON_VERSION%%/test/test_urllibnet.py
 lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyc
 lib/%%PYTHON_VERSION%%/test/test_urllibnet.pyo
@@ -2419,9 +2694,9 @@ lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo
 lib/%%PYTHON_VERSION%%/test/test_xpickle.py
 lib/%%PYTHON_VERSION%%/test/test_xpickle.pyc
 lib/%%PYTHON_VERSION%%/test/test_xpickle.pyo
-lib/%%PYTHON_VERSION%%/test/test_xreadline.py
-lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc
-lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo
+lib/%%PYTHON_VERSION%%/test/test_xrange.py
+lib/%%PYTHON_VERSION%%/test/test_xrange.pyc
+lib/%%PYTHON_VERSION%%/test/test_xrange.pyo
 lib/%%PYTHON_VERSION%%/test/test_zipfile.py
 lib/%%PYTHON_VERSION%%/test/test_zipfile.pyc
 lib/%%PYTHON_VERSION%%/test/test_zipfile.pyo
@@ -2687,7 +2962,6 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mboxconvert.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mkrcs.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/morse.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/mpzpi.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.doc
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/newslist.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/scripts/pi.py
@@ -2969,6 +3243,7 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/google.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/gprof2html.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/hotshotmain.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/idle
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
@@ -3067,6 +3342,7 @@ share/emacs/site-lisp/python-mode.el
 @dirrm lib/%%PYTHON_VERSION%%/xml/dom
 @dirrm lib/%%PYTHON_VERSION%%/xml
 @dirrm lib/%%PYTHON_VERSION%%/test/output
+@dirrm lib/%%PYTHON_VERSION%%/test/decimaltestdata
 @dirrm lib/%%PYTHON_VERSION%%/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd6