4 files changed, 134 insertions, 346 deletions

diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 87763fb3aabb..b17756041bf6 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	2.2
+PORTVERSION=	2.1.1
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/${PORTVERSION}/ \
 		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install
 MAN1=		python.1
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.2
+PYTHON_VERSION=	python2.1
 PYTHON_NO_DEPENDS=	yes
 
 #
@@ -69,7 +69,7 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHON_LIBDIR}/${platform}
-.for file in IN.py regen
+.for file in FCNTL.py IN.py regen
 	${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \
 		${PYTHON_LIBDIR}/${platform}/
 .endfor
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index 79f87b769e7c..3db708b1bae5 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0
+MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4
diff --git a/lang/python21/files/patch-Misc:Makefile.pre.in b/lang/python21/files/patch-Misc:Makefile.pre.in
new file mode 100644
index 000000000000..2eaf2f04c91f
--- /dev/null
+++ b/lang/python21/files/patch-Misc:Makefile.pre.in
@@ -0,0 +1,11 @@
+--- Misc/Makefile.pre.in.orig	Wed Dec  9 18:05:33 1998
++++ Misc/Makefile.pre.in	Thu Sep  7 21:04:19 2000
+@@ -92,7 +92,7 @@
+ TARGET=		python
+ 
+ # Installed python binary (used only by boot target)
+-PYTHON=		python
++PYTHON?=	python
+ 
+ # Add more -I and -D options here
+ CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist
index 06c1168cbf7a..ff047a75b7ac 100644
--- a/lang/python21/pkg-plist
+++ b/lang/python21/pkg-plist
@@ -13,7 +13,7 @@ include/%%PYTHON_VERSION%%/cobject.h
 include/%%PYTHON_VERSION%%/codecs.h
 include/%%PYTHON_VERSION%%/compile.h
 include/%%PYTHON_VERSION%%/complexobject.h
-include/%%PYTHON_VERSION%%/descrobject.h
+include/%%PYTHON_VERSION%%/config.h
 include/%%PYTHON_VERSION%%/dictobject.h
 include/%%PYTHON_VERSION%%/errcode.h
 include/%%PYTHON_VERSION%%/eval.h
@@ -26,7 +26,6 @@ include/%%PYTHON_VERSION%%/grammar.h
 include/%%PYTHON_VERSION%%/import.h
 include/%%PYTHON_VERSION%%/intobject.h
 include/%%PYTHON_VERSION%%/intrcheck.h
-include/%%PYTHON_VERSION%%/iterobject.h
 include/%%PYTHON_VERSION%%/listobject.h
 include/%%PYTHON_VERSION%%/longintrepr.h
 include/%%PYTHON_VERSION%%/longobject.h
@@ -44,12 +43,10 @@ include/%%PYTHON_VERSION%%/parsetok.h
 include/%%PYTHON_VERSION%%/patchlevel.h
 include/%%PYTHON_VERSION%%/pgenheaders.h
 include/%%PYTHON_VERSION%%/py_curses.h
-include/%%PYTHON_VERSION%%/pyconfig.h
 include/%%PYTHON_VERSION%%/pydebug.h
 include/%%PYTHON_VERSION%%/pyerrors.h
 include/%%PYTHON_VERSION%%/pyfpe.h
 include/%%PYTHON_VERSION%%/pygetopt.h
-include/%%PYTHON_VERSION%%/pymactoolbox.h
 include/%%PYTHON_VERSION%%/pymem.h
 include/%%PYTHON_VERSION%%/pyport.h
 include/%%PYTHON_VERSION%%/pystate.h
@@ -59,7 +56,6 @@ include/%%PYTHON_VERSION%%/rangeobject.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%%/token.h
@@ -67,7 +63,6 @@ include/%%PYTHON_VERSION%%/traceback.h
 include/%%PYTHON_VERSION%%/tupleobject.h
 include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
-include/%%PYTHON_VERSION%%/weakrefobject.h
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
@@ -83,12 +78,6 @@ lib/%%PYTHON_VERSION%%/ConfigParser.pyo
 lib/%%PYTHON_VERSION%%/Cookie.py
 lib/%%PYTHON_VERSION%%/Cookie.pyc
 lib/%%PYTHON_VERSION%%/Cookie.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
 lib/%%PYTHON_VERSION%%/LICENSE.txt
 lib/%%PYTHON_VERSION%%/MimeWriter.py
 lib/%%PYTHON_VERSION%%/MimeWriter.pyc
@@ -99,9 +88,6 @@ lib/%%PYTHON_VERSION%%/Queue.pyo
 lib/%%PYTHON_VERSION%%/SimpleHTTPServer.py
 lib/%%PYTHON_VERSION%%/SimpleHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/SimpleHTTPServer.pyo
-lib/%%PYTHON_VERSION%%/SimpleXMLRPCServer.py
-lib/%%PYTHON_VERSION%%/SimpleXMLRPCServer.pyc
-lib/%%PYTHON_VERSION%%/SimpleXMLRPCServer.pyo
 lib/%%PYTHON_VERSION%%/SocketServer.py
 lib/%%PYTHON_VERSION%%/SocketServer.pyc
 lib/%%PYTHON_VERSION%%/SocketServer.pyo
@@ -130,15 +116,23 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/bgenlocations.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/macsupport.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/bgen/bgen/scantools.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ACKS
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/ast.txt
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/astgen.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.txt
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/astgen.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/future.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/symbols.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/stacktest.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/README
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py
@@ -164,6 +158,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/Bindings.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/BrowserControl.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTipWindow.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/CallTips.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ChangeLog
@@ -215,7 +210,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/WindowList.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/ZoomHeight.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/__init__.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-mac.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-unix.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config-win.txt
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/idle/config.txt
@@ -285,23 +279,19 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkappend.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/checkpyc.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/classfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cleanfuture.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/findlinksto.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixcid.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixdiv.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixheader.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixnotice.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/fixps.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ftpmirror.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/gencodec.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/google.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py
@@ -310,7 +300,6 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/logmerge.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mailerdaemon.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/methfix.py
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/md5sum.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/mkreal.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ndiff.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/nm2def.py
@@ -321,7 +310,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
-%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc.pyw
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
 %%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py
@@ -359,9 +348,6 @@ lib/%%PYTHON_VERSION%%/UserString.pyo
 lib/%%PYTHON_VERSION%%/__future__.py
 lib/%%PYTHON_VERSION%%/__future__.pyc
 lib/%%PYTHON_VERSION%%/__future__.pyo
-lib/%%PYTHON_VERSION%%/__phello__.foo.py
-lib/%%PYTHON_VERSION%%/__phello__.foo.pyc
-lib/%%PYTHON_VERSION%%/__phello__.foo.pyo
 lib/%%PYTHON_VERSION%%/aifc.py
 lib/%%PYTHON_VERSION%%/aifc.pyc
 lib/%%PYTHON_VERSION%%/aifc.pyo
@@ -398,9 +384,6 @@ lib/%%PYTHON_VERSION%%/calendar.pyo
 lib/%%PYTHON_VERSION%%/cgi.py
 lib/%%PYTHON_VERSION%%/cgi.pyc
 lib/%%PYTHON_VERSION%%/cgi.pyo
-lib/%%PYTHON_VERSION%%/cgitb.py
-lib/%%PYTHON_VERSION%%/cgitb.pyc
-lib/%%PYTHON_VERSION%%/cgitb.pyo
 lib/%%PYTHON_VERSION%%/chunk.py
 lib/%%PYTHON_VERSION%%/chunk.pyc
 lib/%%PYTHON_VERSION%%/chunk.pyo
@@ -425,40 +408,8 @@ lib/%%PYTHON_VERSION%%/commands.pyo
 lib/%%PYTHON_VERSION%%/compileall.py
 lib/%%PYTHON_VERSION%%/compileall.pyc
 lib/%%PYTHON_VERSION%%/compileall.pyo
-lib/%%PYTHON_VERSION%%/compiler/__init__.py
-lib/%%PYTHON_VERSION%%/compiler/__init__.pyc
-lib/%%PYTHON_VERSION%%/compiler/__init__.pyo
-lib/%%PYTHON_VERSION%%/compiler/ast.py
-lib/%%PYTHON_VERSION%%/compiler/ast.pyc
-lib/%%PYTHON_VERSION%%/compiler/ast.pyo
-lib/%%PYTHON_VERSION%%/compiler/consts.py
-lib/%%PYTHON_VERSION%%/compiler/consts.pyc
-lib/%%PYTHON_VERSION%%/compiler/consts.pyo
-lib/%%PYTHON_VERSION%%/compiler/future.py
-lib/%%PYTHON_VERSION%%/compiler/future.pyc
-lib/%%PYTHON_VERSION%%/compiler/future.pyo
-lib/%%PYTHON_VERSION%%/compiler/misc.py
-lib/%%PYTHON_VERSION%%/compiler/misc.pyc
-lib/%%PYTHON_VERSION%%/compiler/misc.pyo
-lib/%%PYTHON_VERSION%%/compiler/pyassem.py
-lib/%%PYTHON_VERSION%%/compiler/pyassem.pyc
-lib/%%PYTHON_VERSION%%/compiler/pyassem.pyo
-lib/%%PYTHON_VERSION%%/compiler/pycodegen.py
-lib/%%PYTHON_VERSION%%/compiler/pycodegen.pyc
-lib/%%PYTHON_VERSION%%/compiler/pycodegen.pyo
-lib/%%PYTHON_VERSION%%/compiler/symbols.py
-lib/%%PYTHON_VERSION%%/compiler/symbols.pyc
-lib/%%PYTHON_VERSION%%/compiler/symbols.pyo
-lib/%%PYTHON_VERSION%%/compiler/syntax.py
-lib/%%PYTHON_VERSION%%/compiler/syntax.pyc
-lib/%%PYTHON_VERSION%%/compiler/syntax.pyo
-lib/%%PYTHON_VERSION%%/compiler/transformer.py
-lib/%%PYTHON_VERSION%%/compiler/transformer.pyc
-lib/%%PYTHON_VERSION%%/compiler/transformer.pyo
-lib/%%PYTHON_VERSION%%/compiler/visitor.py
-lib/%%PYTHON_VERSION%%/compiler/visitor.pyc
-lib/%%PYTHON_VERSION%%/compiler/visitor.pyo
 lib/%%PYTHON_VERSION%%/config/Makefile
+lib/%%PYTHON_VERSION%%/config/Makefile.pre.in
 lib/%%PYTHON_VERSION%%/config/Setup
 lib/%%PYTHON_VERSION%%/config/Setup.config
 lib/%%PYTHON_VERSION%%/config/Setup.local
@@ -638,45 +589,6 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
 lib/%%PYTHON_VERSION%%/dumbdbm.py
 lib/%%PYTHON_VERSION%%/dumbdbm.pyc
 lib/%%PYTHON_VERSION%%/dumbdbm.pyo
-lib/%%PYTHON_VERSION%%/email/Encoders.py
-lib/%%PYTHON_VERSION%%/email/Encoders.pyc
-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/Generator.py
-lib/%%PYTHON_VERSION%%/email/Generator.pyc
-lib/%%PYTHON_VERSION%%/email/Generator.pyo
-lib/%%PYTHON_VERSION%%/email/Iterators.py
-lib/%%PYTHON_VERSION%%/email/Iterators.pyc
-lib/%%PYTHON_VERSION%%/email/Iterators.pyo
-lib/%%PYTHON_VERSION%%/email/MIMEAudio.py
-lib/%%PYTHON_VERSION%%/email/MIMEAudio.pyc
-lib/%%PYTHON_VERSION%%/email/MIMEAudio.pyo
-lib/%%PYTHON_VERSION%%/email/MIMEBase.py
-lib/%%PYTHON_VERSION%%/email/MIMEBase.pyc
-lib/%%PYTHON_VERSION%%/email/MIMEBase.pyo
-lib/%%PYTHON_VERSION%%/email/MIMEImage.py
-lib/%%PYTHON_VERSION%%/email/MIMEImage.pyc
-lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
-lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
-lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
-lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
-lib/%%PYTHON_VERSION%%/email/MIMEText.py
-lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
-lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
-lib/%%PYTHON_VERSION%%/email/Message.py
-lib/%%PYTHON_VERSION%%/email/Message.pyc
-lib/%%PYTHON_VERSION%%/email/Message.pyo
-lib/%%PYTHON_VERSION%%/email/Parser.py
-lib/%%PYTHON_VERSION%%/email/Parser.pyc
-lib/%%PYTHON_VERSION%%/email/Parser.pyo
-lib/%%PYTHON_VERSION%%/email/Utils.py
-lib/%%PYTHON_VERSION%%/email/Utils.pyc
-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%%/encodings/__init__.py
 lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
 lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -686,9 +598,6 @@ lib/%%PYTHON_VERSION%%/encodings/aliases.pyo
 lib/%%PYTHON_VERSION%%/encodings/ascii.py
 lib/%%PYTHON_VERSION%%/encodings/ascii.pyc
 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/charmap.py
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyc
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyo
@@ -701,9 +610,6 @@ lib/%%PYTHON_VERSION%%/encodings/cp1006.pyo
 lib/%%PYTHON_VERSION%%/encodings/cp1026.py
 lib/%%PYTHON_VERSION%%/encodings/cp1026.pyc
 lib/%%PYTHON_VERSION%%/encodings/cp1026.pyo
-lib/%%PYTHON_VERSION%%/encodings/cp1140.py
-lib/%%PYTHON_VERSION%%/encodings/cp1140.pyc
-lib/%%PYTHON_VERSION%%/encodings/cp1140.pyo
 lib/%%PYTHON_VERSION%%/encodings/cp1250.py
 lib/%%PYTHON_VERSION%%/encodings/cp1250.pyc
 lib/%%PYTHON_VERSION%%/encodings/cp1250.pyo
@@ -791,9 +697,6 @@ 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/hex_codec.py
-lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyc
-lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo
@@ -860,15 +763,9 @@ lib/%%PYTHON_VERSION%%/encodings/mac_turkish.pyo
 lib/%%PYTHON_VERSION%%/encodings/mbcs.py
 lib/%%PYTHON_VERSION%%/encodings/mbcs.pyc
 lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo
-lib/%%PYTHON_VERSION%%/encodings/quopri_codec.py
-lib/%%PYTHON_VERSION%%/encodings/quopri_codec.pyc
-lib/%%PYTHON_VERSION%%/encodings/quopri_codec.pyo
 lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py
 lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc
 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/undefined.py
 lib/%%PYTHON_VERSION%%/encodings/undefined.pyc
 lib/%%PYTHON_VERSION%%/encodings/undefined.pyo
@@ -887,18 +784,9 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_be.pyo
 lib/%%PYTHON_VERSION%%/encodings/utf_16_le.py
 lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyc
 lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo
-lib/%%PYTHON_VERSION%%/encodings/utf_7.py
-lib/%%PYTHON_VERSION%%/encodings/utf_7.pyc
-lib/%%PYTHON_VERSION%%/encodings/utf_7.pyo
 lib/%%PYTHON_VERSION%%/encodings/utf_8.py
 lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc
 lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo
-lib/%%PYTHON_VERSION%%/encodings/uu_codec.py
-lib/%%PYTHON_VERSION%%/encodings/uu_codec.pyc
-lib/%%PYTHON_VERSION%%/encodings/uu_codec.pyo
-lib/%%PYTHON_VERSION%%/encodings/zlib_codec.py
-lib/%%PYTHON_VERSION%%/encodings/zlib_codec.pyc
-lib/%%PYTHON_VERSION%%/encodings/zlib_codec.pyo
 lib/%%PYTHON_VERSION%%/filecmp.py
 lib/%%PYTHON_VERSION%%/filecmp.pyc
 lib/%%PYTHON_VERSION%%/filecmp.pyo
@@ -935,18 +823,6 @@ lib/%%PYTHON_VERSION%%/gopherlib.pyo
 lib/%%PYTHON_VERSION%%/gzip.py
 lib/%%PYTHON_VERSION%%/gzip.pyc
 lib/%%PYTHON_VERSION%%/gzip.pyo
-lib/%%PYTHON_VERSION%%/hmac.py
-lib/%%PYTHON_VERSION%%/hmac.pyc
-lib/%%PYTHON_VERSION%%/hmac.pyo
-lib/%%PYTHON_VERSION%%/hotshot/__init__.py
-lib/%%PYTHON_VERSION%%/hotshot/__init__.pyc
-lib/%%PYTHON_VERSION%%/hotshot/__init__.pyo
-lib/%%PYTHON_VERSION%%/hotshot/log.py
-lib/%%PYTHON_VERSION%%/hotshot/log.pyc
-lib/%%PYTHON_VERSION%%/hotshot/log.pyo
-lib/%%PYTHON_VERSION%%/hotshot/stats.py
-lib/%%PYTHON_VERSION%%/hotshot/stats.pyc
-lib/%%PYTHON_VERSION%%/hotshot/stats.pyo
 lib/%%PYTHON_VERSION%%/htmlentitydefs.py
 lib/%%PYTHON_VERSION%%/htmlentitydefs.pyc
 lib/%%PYTHON_VERSION%%/htmlentitydefs.pyo
@@ -980,9 +856,9 @@ lib/%%PYTHON_VERSION%%/knee.pyo
 lib/%%PYTHON_VERSION%%/lib-dynload/_codecs.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so
-lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_symtable.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
@@ -1002,6 +878,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
+lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
 lib/%%PYTHON_VERSION%%/lib-dynload/parser.so
@@ -1152,9 +1029,6 @@ lib/%%PYTHON_VERSION%%/mailbox.pyo
 lib/%%PYTHON_VERSION%%/mailcap.py
 lib/%%PYTHON_VERSION%%/mailcap.pyc
 lib/%%PYTHON_VERSION%%/mailcap.pyo
-lib/%%PYTHON_VERSION%%/markupbase.py
-lib/%%PYTHON_VERSION%%/markupbase.pyc
-lib/%%PYTHON_VERSION%%/markupbase.pyo
 lib/%%PYTHON_VERSION%%/mhlib.py
 lib/%%PYTHON_VERSION%%/mhlib.pyc
 lib/%%PYTHON_VERSION%%/mhlib.pyo
@@ -1198,18 +1072,30 @@ lib/%%PYTHON_VERSION%%/pickle.pyo
 lib/%%PYTHON_VERSION%%/pipes.py
 lib/%%PYTHON_VERSION%%/pipes.pyc
 lib/%%PYTHON_VERSION%%/pipes.pyo
+lib/%%PYTHON_VERSION%%/plat-freebsd2/FCNTL.py
+lib/%%PYTHON_VERSION%%/plat-freebsd2/FCNTL.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd2/FCNTL.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd2/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd2/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd2/IN.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd2/regen
+lib/%%PYTHON_VERSION%%/plat-freebsd3/FCNTL.py
+lib/%%PYTHON_VERSION%%/plat-freebsd3/FCNTL.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd3/FCNTL.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd3/IN.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd3/regen
+lib/%%PYTHON_VERSION%%/plat-freebsd4/FCNTL.py
+lib/%%PYTHON_VERSION%%/plat-freebsd4/FCNTL.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd4/FCNTL.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd4/IN.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd4/regen
+lib/%%PYTHON_VERSION%%/plat-freebsd5/FCNTL.py
+lib/%%PYTHON_VERSION%%/plat-freebsd5/FCNTL.pyc
+lib/%%PYTHON_VERSION%%/plat-freebsd5/FCNTL.pyo
 lib/%%PYTHON_VERSION%%/plat-freebsd5/IN.py
 lib/%%PYTHON_VERSION%%/plat-freebsd5/IN.pyc
 lib/%%PYTHON_VERSION%%/plat-freebsd5/IN.pyo
@@ -1371,112 +1257,150 @@ lib/%%PYTHON_VERSION%%/test/audiotest.au
 lib/%%PYTHON_VERSION%%/test/autotest.py
 lib/%%PYTHON_VERSION%%/test/autotest.pyc
 lib/%%PYTHON_VERSION%%/test/autotest.pyo
-lib/%%PYTHON_VERSION%%/test/badsyntax_future3.py
-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_nocaret.py
-lib/%%PYTHON_VERSION%%/test/data/PyBanner048.gif
-lib/%%PYTHON_VERSION%%/test/data/msg_01.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_02.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_03.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_04.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_05.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_06.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_07.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_08.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_09.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_10.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_11.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_12.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_13.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_14.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_15.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_16.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_17.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_18.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_19.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_20.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_21.txt
-lib/%%PYTHON_VERSION%%/test/data/msg_22.txt
-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/nocaret.py
 lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
+lib/%%PYTHON_VERSION%%/test/output/test_StringIO
+lib/%%PYTHON_VERSION%%/test/output/test___all__
+lib/%%PYTHON_VERSION%%/test/output/test___future__
+lib/%%PYTHON_VERSION%%/test/output/test_al
+lib/%%PYTHON_VERSION%%/test/output/test_array
 lib/%%PYTHON_VERSION%%/test/output/test_asynchat
 lib/%%PYTHON_VERSION%%/test/output/test_atexit
+lib/%%PYTHON_VERSION%%/test/output/test_audioop
 lib/%%PYTHON_VERSION%%/test/output/test_augassign
 lib/%%PYTHON_VERSION%%/test/output/test_bastion
 lib/%%PYTHON_VERSION%%/test/output/test_binascii
+lib/%%PYTHON_VERSION%%/test/output/test_binhex
+lib/%%PYTHON_VERSION%%/test/output/test_bisect
+lib/%%PYTHON_VERSION%%/test/output/test_bsddb
+lib/%%PYTHON_VERSION%%/test/output/test_bufio
 lib/%%PYTHON_VERSION%%/test/output/test_builtin
+lib/%%PYTHON_VERSION%%/test/output/test_capi
+lib/%%PYTHON_VERSION%%/test/output/test_cd
 lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
 lib/%%PYTHON_VERSION%%/test/output/test_cgi
 lib/%%PYTHON_VERSION%%/test/output/test_charmapcodec
+lib/%%PYTHON_VERSION%%/test/output/test_cl
 lib/%%PYTHON_VERSION%%/test/output/test_class
+lib/%%PYTHON_VERSION%%/test/output/test_cmath
 lib/%%PYTHON_VERSION%%/test/output/test_coercion
 lib/%%PYTHON_VERSION%%/test/output/test_compare
 lib/%%PYTHON_VERSION%%/test/output/test_compile
+lib/%%PYTHON_VERSION%%/test/output/test_complex
+lib/%%PYTHON_VERSION%%/test/output/test_contains
 lib/%%PYTHON_VERSION%%/test/output/test_cookie
+lib/%%PYTHON_VERSION%%/test/output/test_copy_reg
+lib/%%PYTHON_VERSION%%/test/output/test_cpickle
+lib/%%PYTHON_VERSION%%/test/output/test_crypt
+lib/%%PYTHON_VERSION%%/test/output/test_dbm
+lib/%%PYTHON_VERSION%%/test/output/test_difflib
+lib/%%PYTHON_VERSION%%/test/output/test_dl
+lib/%%PYTHON_VERSION%%/test/output/test_doctest
+lib/%%PYTHON_VERSION%%/test/output/test_dospath
+lib/%%PYTHON_VERSION%%/test/output/test_dumbdbm
+lib/%%PYTHON_VERSION%%/test/output/test_errno
 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_fcntl
+lib/%%PYTHON_VERSION%%/test/output/test_file
+lib/%%PYTHON_VERSION%%/test/output/test_fnmatch
+lib/%%PYTHON_VERSION%%/test/output/test_fork1
+lib/%%PYTHON_VERSION%%/test/output/test_format
+lib/%%PYTHON_VERSION%%/test/output/test_funcattrs
 lib/%%PYTHON_VERSION%%/test/output/test_future
+lib/%%PYTHON_VERSION%%/test/output/test_gc
+lib/%%PYTHON_VERSION%%/test/output/test_gdbm
+lib/%%PYTHON_VERSION%%/test/output/test_getopt
 lib/%%PYTHON_VERSION%%/test/output/test_gettext
+lib/%%PYTHON_VERSION%%/test/output/test_gl
 lib/%%PYTHON_VERSION%%/test/output/test_global
 lib/%%PYTHON_VERSION%%/test/output/test_grammar
+lib/%%PYTHON_VERSION%%/test/output/test_grp
+lib/%%PYTHON_VERSION%%/test/output/test_gzip
+lib/%%PYTHON_VERSION%%/test/output/test_hash
 lib/%%PYTHON_VERSION%%/test/output/test_httplib
+lib/%%PYTHON_VERSION%%/test/output/test_imageop
+lib/%%PYTHON_VERSION%%/test/output/test_imgfile
+lib/%%PYTHON_VERSION%%/test/output/test_import
+lib/%%PYTHON_VERSION%%/test/output/test_inspect
+lib/%%PYTHON_VERSION%%/test/output/test_largefile
 lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev
+lib/%%PYTHON_VERSION%%/test/output/test_locale
+lib/%%PYTHON_VERSION%%/test/output/test_long
 lib/%%PYTHON_VERSION%%/test/output/test_longexp
+lib/%%PYTHON_VERSION%%/test/output/test_mailbox
 lib/%%PYTHON_VERSION%%/test/output/test_math
 lib/%%PYTHON_VERSION%%/test/output/test_md5
 lib/%%PYTHON_VERSION%%/test/output/test_mimetools
 lib/%%PYTHON_VERSION%%/test/output/test_minidom
 lib/%%PYTHON_VERSION%%/test/output/test_mmap
+lib/%%PYTHON_VERSION%%/test/output/test_mutants
 lib/%%PYTHON_VERSION%%/test/output/test_new
 lib/%%PYTHON_VERSION%%/test/output/test_nis
+lib/%%PYTHON_VERSION%%/test/output/test_ntpath
 lib/%%PYTHON_VERSION%%/test/output/test_opcodes
 lib/%%PYTHON_VERSION%%/test/output/test_openpty
 lib/%%PYTHON_VERSION%%/test/output/test_operations
+lib/%%PYTHON_VERSION%%/test/output/test_operator
+lib/%%PYTHON_VERSION%%/test/output/test_parser
+lib/%%PYTHON_VERSION%%/test/output/test_pickle
 lib/%%PYTHON_VERSION%%/test/output/test_pkg
 lib/%%PYTHON_VERSION%%/test/output/test_poll
 lib/%%PYTHON_VERSION%%/test/output/test_popen2
 lib/%%PYTHON_VERSION%%/test/output/test_posixpath
 lib/%%PYTHON_VERSION%%/test/output/test_pow
-lib/%%PYTHON_VERSION%%/test/output/test_profile
 lib/%%PYTHON_VERSION%%/test/output/test_pty
 lib/%%PYTHON_VERSION%%/test/output/test_pwd
 lib/%%PYTHON_VERSION%%/test/output/test_pyexpat
 lib/%%PYTHON_VERSION%%/test/output/test_re
 lib/%%PYTHON_VERSION%%/test/output/test_regex
+lib/%%PYTHON_VERSION%%/test/output/test_rfc822
 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg
 lib/%%PYTHON_VERSION%%/test/output/test_richcmp
 lib/%%PYTHON_VERSION%%/test/output/test_rotor
 lib/%%PYTHON_VERSION%%/test/output/test_sax
 lib/%%PYTHON_VERSION%%/test/output/test_scope
+lib/%%PYTHON_VERSION%%/test/output/test_select
+lib/%%PYTHON_VERSION%%/test/output/test_sha
 lib/%%PYTHON_VERSION%%/test/output/test_signal
 lib/%%PYTHON_VERSION%%/test/output/test_socket
+lib/%%PYTHON_VERSION%%/test/output/test_socketserver
+lib/%%PYTHON_VERSION%%/test/output/test_sre
+lib/%%PYTHON_VERSION%%/test/output/test_strftime
 lib/%%PYTHON_VERSION%%/test/output/test_string
+lib/%%PYTHON_VERSION%%/test/output/test_strop
+lib/%%PYTHON_VERSION%%/test/output/test_struct
+lib/%%PYTHON_VERSION%%/test/output/test_sunaudiodev
+lib/%%PYTHON_VERSION%%/test/output/test_sundry
+lib/%%PYTHON_VERSION%%/test/output/test_symtable
 lib/%%PYTHON_VERSION%%/test/output/test_thread
 lib/%%PYTHON_VERSION%%/test/output/test_threadedtempfile
+lib/%%PYTHON_VERSION%%/test/output/test_time
+lib/%%PYTHON_VERSION%%/test/output/test_timing
 lib/%%PYTHON_VERSION%%/test/output/test_tokenize
+lib/%%PYTHON_VERSION%%/test/output/test_traceback
 lib/%%PYTHON_VERSION%%/test/output/test_types
 lib/%%PYTHON_VERSION%%/test/output/test_ucn
 lib/%%PYTHON_VERSION%%/test/output/test_unicode
-lib/%%PYTHON_VERSION%%/test/output/test_unicode_file
 lib/%%PYTHON_VERSION%%/test/output/test_unicodedata
+lib/%%PYTHON_VERSION%%/test/output/test_unpack
+lib/%%PYTHON_VERSION%%/test/output/test_urllib
 lib/%%PYTHON_VERSION%%/test/output/test_urlparse
+lib/%%PYTHON_VERSION%%/test/output/test_userdict
+lib/%%PYTHON_VERSION%%/test/output/test_userlist
+lib/%%PYTHON_VERSION%%/test/output/test_userstring
+lib/%%PYTHON_VERSION%%/test/output/test_wave
+lib/%%PYTHON_VERSION%%/test/output/test_weakref
 lib/%%PYTHON_VERSION%%/test/output/test_winreg
 lib/%%PYTHON_VERSION%%/test/output/test_winsound
+lib/%%PYTHON_VERSION%%/test/output/test_xmllib
 lib/%%PYTHON_VERSION%%/test/output/test_xreadline
+lib/%%PYTHON_VERSION%%/test/output/test_zipfile
 lib/%%PYTHON_VERSION%%/test/output/test_zlib
 lib/%%PYTHON_VERSION%%/test/pickletester.py
 lib/%%PYTHON_VERSION%%/test/pickletester.pyc
 lib/%%PYTHON_VERSION%%/test/pickletester.pyo
-lib/%%PYTHON_VERSION%%/test/pydocfodder.py
-lib/%%PYTHON_VERSION%%/test/pydocfodder.pyc
-lib/%%PYTHON_VERSION%%/test/pydocfodder.pyo
 lib/%%PYTHON_VERSION%%/test/pystone.py
 lib/%%PYTHON_VERSION%%/test/pystone.pyc
 lib/%%PYTHON_VERSION%%/test/pystone.pyo
@@ -1545,9 +1469,6 @@ lib/%%PYTHON_VERSION%%/test/test_binascii.pyo
 lib/%%PYTHON_VERSION%%/test/test_binhex.py
 lib/%%PYTHON_VERSION%%/test/test_binhex.pyc
 lib/%%PYTHON_VERSION%%/test/test_binhex.pyo
-lib/%%PYTHON_VERSION%%/test/test_binop.py
-lib/%%PYTHON_VERSION%%/test/test_binop.pyc
-lib/%%PYTHON_VERSION%%/test/test_binop.pyo
 lib/%%PYTHON_VERSION%%/test/test_bisect.py
 lib/%%PYTHON_VERSION%%/test/test_bisect.pyc
 lib/%%PYTHON_VERSION%%/test/test_bisect.pyo
@@ -1560,12 +1481,6 @@ lib/%%PYTHON_VERSION%%/test/test_bufio.pyo
 lib/%%PYTHON_VERSION%%/test/test_builtin.py
 lib/%%PYTHON_VERSION%%/test/test_builtin.pyc
 lib/%%PYTHON_VERSION%%/test/test_builtin.pyo
-lib/%%PYTHON_VERSION%%/test/test_calendar.py
-lib/%%PYTHON_VERSION%%/test/test_calendar.pyc
-lib/%%PYTHON_VERSION%%/test/test_calendar.pyo
-lib/%%PYTHON_VERSION%%/test/test_call.py
-lib/%%PYTHON_VERSION%%/test/test_call.pyc
-lib/%%PYTHON_VERSION%%/test/test_call.pyo
 lib/%%PYTHON_VERSION%%/test/test_capi.py
 lib/%%PYTHON_VERSION%%/test/test_capi.pyc
 lib/%%PYTHON_VERSION%%/test/test_capi.pyo
@@ -1590,18 +1505,9 @@ lib/%%PYTHON_VERSION%%/test/test_class.pyo
 lib/%%PYTHON_VERSION%%/test/test_cmath.py
 lib/%%PYTHON_VERSION%%/test/test_cmath.pyc
 lib/%%PYTHON_VERSION%%/test/test_cmath.pyo
-lib/%%PYTHON_VERSION%%/test/test_codecs.py
-lib/%%PYTHON_VERSION%%/test/test_codecs.pyc
-lib/%%PYTHON_VERSION%%/test/test_codecs.pyo
-lib/%%PYTHON_VERSION%%/test/test_codeop.py
-lib/%%PYTHON_VERSION%%/test/test_codeop.pyc
-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_commands.py
-lib/%%PYTHON_VERSION%%/test/test_commands.pyc
-lib/%%PYTHON_VERSION%%/test/test_commands.pyo
 lib/%%PYTHON_VERSION%%/test/test_compare.py
 lib/%%PYTHON_VERSION%%/test/test_compare.pyc
 lib/%%PYTHON_VERSION%%/test/test_compare.pyo
@@ -1626,42 +1532,24 @@ lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo
 lib/%%PYTHON_VERSION%%/test/test_crypt.py
 lib/%%PYTHON_VERSION%%/test/test_crypt.pyc
 lib/%%PYTHON_VERSION%%/test/test_crypt.pyo
-lib/%%PYTHON_VERSION%%/test/test_curses.py
-lib/%%PYTHON_VERSION%%/test/test_curses.pyc
-lib/%%PYTHON_VERSION%%/test/test_curses.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_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_difflib.py
 lib/%%PYTHON_VERSION%%/test/test_difflib.pyc
 lib/%%PYTHON_VERSION%%/test/test_difflib.pyo
-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_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_doctest2.py
-lib/%%PYTHON_VERSION%%/test/test_doctest2.pyc
-lib/%%PYTHON_VERSION%%/test/test_doctest2.pyo
 lib/%%PYTHON_VERSION%%/test/test_dospath.py
 lib/%%PYTHON_VERSION%%/test/test_dospath.pyc
 lib/%%PYTHON_VERSION%%/test/test_dospath.pyo
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.py
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyc
 lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
-lib/%%PYTHON_VERSION%%/test/test_email.py
-lib/%%PYTHON_VERSION%%/test/test_email.pyc
-lib/%%PYTHON_VERSION%%/test/test_email.pyo
 lib/%%PYTHON_VERSION%%/test/test_errno.py
 lib/%%PYTHON_VERSION%%/test/test_errno.pyc
 lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1677,9 +1565,6 @@ lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo
 lib/%%PYTHON_VERSION%%/test/test_file.py
 lib/%%PYTHON_VERSION%%/test/test_file.pyc
 lib/%%PYTHON_VERSION%%/test/test_file.pyo
-lib/%%PYTHON_VERSION%%/test/test_fileinput.py
-lib/%%PYTHON_VERSION%%/test/test_fileinput.pyc
-lib/%%PYTHON_VERSION%%/test/test_fileinput.pyo
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.py
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.pyc
 lib/%%PYTHON_VERSION%%/test/test_fnmatch.pyo
@@ -1689,12 +1574,6 @@ lib/%%PYTHON_VERSION%%/test/test_fork1.pyo
 lib/%%PYTHON_VERSION%%/test/test_format.py
 lib/%%PYTHON_VERSION%%/test/test_format.pyc
 lib/%%PYTHON_VERSION%%/test/test_format.pyo
-lib/%%PYTHON_VERSION%%/test/test_fpformat.py
-lib/%%PYTHON_VERSION%%/test/test_fpformat.pyc
-lib/%%PYTHON_VERSION%%/test/test_fpformat.pyo
-lib/%%PYTHON_VERSION%%/test/test_frozen.py
-lib/%%PYTHON_VERSION%%/test/test_frozen.pyc
-lib/%%PYTHON_VERSION%%/test/test_frozen.pyo
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.py
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.pyc
 lib/%%PYTHON_VERSION%%/test/test_funcattrs.pyo
@@ -1708,20 +1587,16 @@ lib/%%PYTHON_VERSION%%/test/test_future2.py
 lib/%%PYTHON_VERSION%%/test/test_future2.pyc
 lib/%%PYTHON_VERSION%%/test/test_future2.pyo
 lib/%%PYTHON_VERSION%%/test/test_future3.py
-lib/%%PYTHON_VERSION%%/test/test_future3.pyc
-lib/%%PYTHON_VERSION%%/test/test_future3.pyo
+lib/%%PYTHON_VERSION%%/test/test_future4.py
+lib/%%PYTHON_VERSION%%/test/test_future5.py
+lib/%%PYTHON_VERSION%%/test/test_future6.py
+lib/%%PYTHON_VERSION%%/test/test_future7.py
 lib/%%PYTHON_VERSION%%/test/test_gc.py
 lib/%%PYTHON_VERSION%%/test/test_gc.pyc
 lib/%%PYTHON_VERSION%%/test/test_gc.pyo
 lib/%%PYTHON_VERSION%%/test/test_gdbm.py
 lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc
 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_getargs.py
-lib/%%PYTHON_VERSION%%/test/test_getargs.pyc
-lib/%%PYTHON_VERSION%%/test/test_getargs.pyo
 lib/%%PYTHON_VERSION%%/test/test_getopt.py
 lib/%%PYTHON_VERSION%%/test/test_getopt.pyc
 lib/%%PYTHON_VERSION%%/test/test_getopt.pyo
@@ -1731,9 +1606,6 @@ lib/%%PYTHON_VERSION%%/test/test_gettext.pyo
 lib/%%PYTHON_VERSION%%/test/test_gl.py
 lib/%%PYTHON_VERSION%%/test/test_gl.pyc
 lib/%%PYTHON_VERSION%%/test/test_gl.pyo
-lib/%%PYTHON_VERSION%%/test/test_glob.py
-lib/%%PYTHON_VERSION%%/test/test_glob.pyc
-lib/%%PYTHON_VERSION%%/test/test_glob.pyo
 lib/%%PYTHON_VERSION%%/test/test_global.py
 lib/%%PYTHON_VERSION%%/test/test_global.pyc
 lib/%%PYTHON_VERSION%%/test/test_global.pyo
@@ -1749,18 +1621,6 @@ lib/%%PYTHON_VERSION%%/test/test_gzip.pyo
 lib/%%PYTHON_VERSION%%/test/test_hash.py
 lib/%%PYTHON_VERSION%%/test/test_hash.pyc
 lib/%%PYTHON_VERSION%%/test/test_hash.pyo
-lib/%%PYTHON_VERSION%%/test/test_hmac.py
-lib/%%PYTHON_VERSION%%/test/test_hmac.pyc
-lib/%%PYTHON_VERSION%%/test/test_hmac.pyo
-lib/%%PYTHON_VERSION%%/test/test_hotshot.py
-lib/%%PYTHON_VERSION%%/test/test_hotshot.pyc
-lib/%%PYTHON_VERSION%%/test/test_hotshot.pyo
-lib/%%PYTHON_VERSION%%/test/test_htmllib.py
-lib/%%PYTHON_VERSION%%/test/test_htmllib.pyc
-lib/%%PYTHON_VERSION%%/test/test_htmllib.pyo
-lib/%%PYTHON_VERSION%%/test/test_htmlparser.py
-lib/%%PYTHON_VERSION%%/test/test_htmlparser.pyc
-lib/%%PYTHON_VERSION%%/test/test_htmlparser.pyo
 lib/%%PYTHON_VERSION%%/test/test_httplib.py
 lib/%%PYTHON_VERSION%%/test/test_httplib.pyc
 lib/%%PYTHON_VERSION%%/test/test_httplib.pyo
@@ -1776,9 +1636,6 @@ lib/%%PYTHON_VERSION%%/test/test_import.pyo
 lib/%%PYTHON_VERSION%%/test/test_inspect.py
 lib/%%PYTHON_VERSION%%/test/test_inspect.pyc
 lib/%%PYTHON_VERSION%%/test/test_inspect.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_largefile.py
 lib/%%PYTHON_VERSION%%/test/test_largefile.pyc
 lib/%%PYTHON_VERSION%%/test/test_largefile.pyo
@@ -1791,33 +1648,21 @@ lib/%%PYTHON_VERSION%%/test/test_locale.pyo
 lib/%%PYTHON_VERSION%%/test/test_long.py
 lib/%%PYTHON_VERSION%%/test/test_long.pyc
 lib/%%PYTHON_VERSION%%/test/test_long.pyo
-lib/%%PYTHON_VERSION%%/test/test_long_future.py
-lib/%%PYTHON_VERSION%%/test/test_long_future.pyc
-lib/%%PYTHON_VERSION%%/test/test_long_future.pyo
 lib/%%PYTHON_VERSION%%/test/test_longexp.py
 lib/%%PYTHON_VERSION%%/test/test_longexp.pyc
 lib/%%PYTHON_VERSION%%/test/test_longexp.pyo
 lib/%%PYTHON_VERSION%%/test/test_mailbox.py
 lib/%%PYTHON_VERSION%%/test/test_mailbox.pyc
 lib/%%PYTHON_VERSION%%/test/test_mailbox.pyo
-lib/%%PYTHON_VERSION%%/test/test_marshal.py
-lib/%%PYTHON_VERSION%%/test/test_marshal.pyc
-lib/%%PYTHON_VERSION%%/test/test_marshal.pyo
 lib/%%PYTHON_VERSION%%/test/test_math.py
 lib/%%PYTHON_VERSION%%/test/test_math.pyc
 lib/%%PYTHON_VERSION%%/test/test_math.pyo
 lib/%%PYTHON_VERSION%%/test/test_md5.py
 lib/%%PYTHON_VERSION%%/test/test_md5.pyc
 lib/%%PYTHON_VERSION%%/test/test_md5.pyo
-lib/%%PYTHON_VERSION%%/test/test_mhlib.py
-lib/%%PYTHON_VERSION%%/test/test_mhlib.pyc
-lib/%%PYTHON_VERSION%%/test/test_mhlib.pyo
 lib/%%PYTHON_VERSION%%/test/test_mimetools.py
 lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc
 lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo
-lib/%%PYTHON_VERSION%%/test/test_mimetypes.py
-lib/%%PYTHON_VERSION%%/test/test_mimetypes.pyc
-lib/%%PYTHON_VERSION%%/test/test_mimetypes.pyo
 lib/%%PYTHON_VERSION%%/test/test_minidom.py
 lib/%%PYTHON_VERSION%%/test/test_minidom.pyc
 lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
@@ -1848,24 +1693,15 @@ lib/%%PYTHON_VERSION%%/test/test_operations.pyo
 lib/%%PYTHON_VERSION%%/test/test_operator.py
 lib/%%PYTHON_VERSION%%/test/test_operator.pyc
 lib/%%PYTHON_VERSION%%/test/test_operator.pyo
-lib/%%PYTHON_VERSION%%/test/test_os.py
-lib/%%PYTHON_VERSION%%/test/test_os.pyc
-lib/%%PYTHON_VERSION%%/test/test_os.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_pep247.py
-lib/%%PYTHON_VERSION%%/test/test_pep247.pyc
-lib/%%PYTHON_VERSION%%/test/test_pep247.pyo
 lib/%%PYTHON_VERSION%%/test/test_pickle.py
 lib/%%PYTHON_VERSION%%/test/test_pickle.pyc
 lib/%%PYTHON_VERSION%%/test/test_pickle.pyo
 lib/%%PYTHON_VERSION%%/test/test_pkg.py
 lib/%%PYTHON_VERSION%%/test/test_pkg.pyc
 lib/%%PYTHON_VERSION%%/test/test_pkg.pyo
-lib/%%PYTHON_VERSION%%/test/test_pkgimport.py
-lib/%%PYTHON_VERSION%%/test/test_pkgimport.pyc
-lib/%%PYTHON_VERSION%%/test/test_pkgimport.pyo
 lib/%%PYTHON_VERSION%%/test/test_poll.py
 lib/%%PYTHON_VERSION%%/test/test_poll.pyc
 lib/%%PYTHON_VERSION%%/test/test_poll.pyo
@@ -1878,39 +1714,21 @@ lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo
 lib/%%PYTHON_VERSION%%/test/test_pow.py
 lib/%%PYTHON_VERSION%%/test/test_pow.pyc
 lib/%%PYTHON_VERSION%%/test/test_pow.pyo
-lib/%%PYTHON_VERSION%%/test/test_pprint.py
-lib/%%PYTHON_VERSION%%/test/test_pprint.pyc
-lib/%%PYTHON_VERSION%%/test/test_pprint.pyo
-lib/%%PYTHON_VERSION%%/test/test_profile.py
-lib/%%PYTHON_VERSION%%/test/test_profile.pyc
-lib/%%PYTHON_VERSION%%/test/test_profile.pyo
-lib/%%PYTHON_VERSION%%/test/test_profilehooks.py
-lib/%%PYTHON_VERSION%%/test/test_profilehooks.pyc
-lib/%%PYTHON_VERSION%%/test/test_profilehooks.pyo
 lib/%%PYTHON_VERSION%%/test/test_pty.py
 lib/%%PYTHON_VERSION%%/test/test_pty.pyc
 lib/%%PYTHON_VERSION%%/test/test_pty.pyo
 lib/%%PYTHON_VERSION%%/test/test_pwd.py
 lib/%%PYTHON_VERSION%%/test/test_pwd.pyc
 lib/%%PYTHON_VERSION%%/test/test_pwd.pyo
-lib/%%PYTHON_VERSION%%/test/test_pyclbr.py
-lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyc
-lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
 lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
 lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
 lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
-lib/%%PYTHON_VERSION%%/test/test_quopri.py
-lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
-lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
 lib/%%PYTHON_VERSION%%/test/test_re.py
 lib/%%PYTHON_VERSION%%/test/test_re.pyc
 lib/%%PYTHON_VERSION%%/test/test_re.pyo
 lib/%%PYTHON_VERSION%%/test/test_regex.py
 lib/%%PYTHON_VERSION%%/test/test_regex.pyc
 lib/%%PYTHON_VERSION%%/test/test_regex.pyo
-lib/%%PYTHON_VERSION%%/test/test_repr.py
-lib/%%PYTHON_VERSION%%/test/test_repr.pyc
-lib/%%PYTHON_VERSION%%/test/test_repr.pyo
 lib/%%PYTHON_VERSION%%/test/test_rfc822.py
 lib/%%PYTHON_VERSION%%/test/test_rfc822.pyc
 lib/%%PYTHON_VERSION%%/test/test_rfc822.pyo
@@ -1932,9 +1750,6 @@ lib/%%PYTHON_VERSION%%/test/test_scope.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_sgmllib.py
-lib/%%PYTHON_VERSION%%/test/test_sgmllib.pyc
-lib/%%PYTHON_VERSION%%/test/test_sgmllib.pyo
 lib/%%PYTHON_VERSION%%/test/test_sha.py
 lib/%%PYTHON_VERSION%%/test/test_sha.pyc
 lib/%%PYTHON_VERSION%%/test/test_sha.pyo
@@ -1944,9 +1759,6 @@ lib/%%PYTHON_VERSION%%/test/test_signal.pyo
 lib/%%PYTHON_VERSION%%/test/test_socket.py
 lib/%%PYTHON_VERSION%%/test/test_socket.pyc
 lib/%%PYTHON_VERSION%%/test/test_socket.pyo
-lib/%%PYTHON_VERSION%%/test/test_socket_ssl.py
-lib/%%PYTHON_VERSION%%/test/test_socket_ssl.pyc
-lib/%%PYTHON_VERSION%%/test/test_socket_ssl.pyo
 lib/%%PYTHON_VERSION%%/test/test_socketserver.py
 lib/%%PYTHON_VERSION%%/test/test_socketserver.pyc
 lib/%%PYTHON_VERSION%%/test/test_socketserver.pyo
@@ -1965,9 +1777,6 @@ lib/%%PYTHON_VERSION%%/test/test_strop.pyo
 lib/%%PYTHON_VERSION%%/test/test_struct.py
 lib/%%PYTHON_VERSION%%/test/test_struct.pyc
 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_sunaudiodev.py
 lib/%%PYTHON_VERSION%%/test/test_sunaudiodev.pyc
 lib/%%PYTHON_VERSION%%/test/test_sunaudiodev.pyo
@@ -1980,21 +1789,12 @@ lib/%%PYTHON_VERSION%%/test/test_support.pyo
 lib/%%PYTHON_VERSION%%/test/test_symtable.py
 lib/%%PYTHON_VERSION%%/test/test_symtable.pyc
 lib/%%PYTHON_VERSION%%/test/test_symtable.pyo
-lib/%%PYTHON_VERSION%%/test/test_tempfile.py
-lib/%%PYTHON_VERSION%%/test/test_tempfile.pyc
-lib/%%PYTHON_VERSION%%/test/test_tempfile.pyo
 lib/%%PYTHON_VERSION%%/test/test_thread.py
 lib/%%PYTHON_VERSION%%/test/test_thread.pyc
 lib/%%PYTHON_VERSION%%/test/test_thread.pyo
-lib/%%PYTHON_VERSION%%/test/test_threaded_import.py
-lib/%%PYTHON_VERSION%%/test/test_threaded_import.pyc
-lib/%%PYTHON_VERSION%%/test/test_threaded_import.pyo
 lib/%%PYTHON_VERSION%%/test/test_threadedtempfile.py
 lib/%%PYTHON_VERSION%%/test/test_threadedtempfile.pyc
 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_time.py
 lib/%%PYTHON_VERSION%%/test/test_time.pyc
 lib/%%PYTHON_VERSION%%/test/test_time.pyo
@@ -2013,15 +1813,9 @@ lib/%%PYTHON_VERSION%%/test/test_types.pyo
 lib/%%PYTHON_VERSION%%/test/test_ucn.py
 lib/%%PYTHON_VERSION%%/test/test_ucn.pyc
 lib/%%PYTHON_VERSION%%/test/test_ucn.pyo
-lib/%%PYTHON_VERSION%%/test/test_unary.py
-lib/%%PYTHON_VERSION%%/test/test_unary.pyc
-lib/%%PYTHON_VERSION%%/test/test_unary.pyo
 lib/%%PYTHON_VERSION%%/test/test_unicode.py
 lib/%%PYTHON_VERSION%%/test/test_unicode.pyc
 lib/%%PYTHON_VERSION%%/test/test_unicode.pyo
-lib/%%PYTHON_VERSION%%/test/test_unicode_file.py
-lib/%%PYTHON_VERSION%%/test/test_unicode_file.pyc
-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
@@ -2031,9 +1825,6 @@ lib/%%PYTHON_VERSION%%/test/test_unpack.pyo
 lib/%%PYTHON_VERSION%%/test/test_urllib.py
 lib/%%PYTHON_VERSION%%/test/test_urllib.pyc
 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_urlparse.py
 lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc
 lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo
@@ -2046,9 +1837,6 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo
 lib/%%PYTHON_VERSION%%/test/test_userstring.py
 lib/%%PYTHON_VERSION%%/test/test_userstring.pyc
 lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
-lib/%%PYTHON_VERSION%%/test/test_uu.py
-lib/%%PYTHON_VERSION%%/test/test_uu.pyc
-lib/%%PYTHON_VERSION%%/test/test_uu.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2064,9 +1852,6 @@ lib/%%PYTHON_VERSION%%/test/test_winsound.pyo
 lib/%%PYTHON_VERSION%%/test/test_xmllib.py
 lib/%%PYTHON_VERSION%%/test/test_xmllib.pyc
 lib/%%PYTHON_VERSION%%/test/test_xmllib.pyo
-lib/%%PYTHON_VERSION%%/test/test_xmlrpc.py
-lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyc
-lib/%%PYTHON_VERSION%%/test/test_xmlrpc.pyo
 lib/%%PYTHON_VERSION%%/test/test_xreadline.py
 lib/%%PYTHON_VERSION%%/test/test_xreadline.pyc
 lib/%%PYTHON_VERSION%%/test/test_xreadline.pyo
@@ -2088,9 +1873,6 @@ lib/%%PYTHON_VERSION%%/test/testrgb.uue
 lib/%%PYTHON_VERSION%%/test/tokenize_tests.py
 lib/%%PYTHON_VERSION%%/test/tokenize_tests.pyc
 lib/%%PYTHON_VERSION%%/test/tokenize_tests.pyo
-lib/%%PYTHON_VERSION%%/this.py
-lib/%%PYTHON_VERSION%%/this.pyc
-lib/%%PYTHON_VERSION%%/this.pyo
 lib/%%PYTHON_VERSION%%/threading.py
 lib/%%PYTHON_VERSION%%/threading.pyc
 lib/%%PYTHON_VERSION%%/threading.pyo
@@ -2196,9 +1978,6 @@ lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo
 lib/%%PYTHON_VERSION%%/xmllib.py
 lib/%%PYTHON_VERSION%%/xmllib.pyc
 lib/%%PYTHON_VERSION%%/xmllib.pyo
-lib/%%PYTHON_VERSION%%/xmlrpclib.py
-lib/%%PYTHON_VERSION%%/xmlrpclib.pyc
-lib/%%PYTHON_VERSION%%/xmlrpclib.pyo
 lib/%%PYTHON_VERSION%%/zipfile.py
 lib/%%PYTHON_VERSION%%/zipfile.pyc
 lib/%%PYTHON_VERSION%%/zipfile.pyo
@@ -2226,6 +2005,12 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/curses/repeat.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/curses/tclock.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/curses/xmas.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/README
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/asgethost.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/dnsclass.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/dnslib.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/dnsopcode.py
+%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/dns/dnstype.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/.cvsignore
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/Makefile
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/embed/README
@@ -2455,11 +2240,8 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/CmpImg.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/ComboBox.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/Control.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/DirList.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/DirTree.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/NoteBook.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/OptMenu.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/PanedWin.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/PopMenu.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/SHList1.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/tix/samples/SHList2.py
@@ -2529,12 +2311,9 @@ share/emacs/site-lisp/python-mode.el
 %%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
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/xmlrpc/xmlrpc_handler.py
-%%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/xmlrpc/xmlrpcserver.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/zlib/minigzip.py
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/zlib/zlibdemo.py
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/zlib
-%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xmlrpc
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/xml
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/tix/samples
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/tix/bitmaps
@@ -2562,6 +2341,7 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/imputil
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/extend
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/embed
+%%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/dns
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/curses
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/comparisons
 %%PORTDOCS%%@dirrm share/examples/%%PYTHON_VERSION%%/classes
@@ -2571,7 +2351,6 @@ 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/data
 @dirrm lib/%%PYTHON_VERSION%%/test
 @dirrm lib/%%PYTHON_VERSION%%/site-packages
 @dirrm lib/%%PYTHON_VERSION%%/plat-freebsd5
@@ -2581,14 +2360,11 @@ share/emacs/site-lisp/python-mode.el
 @dirrm lib/%%PYTHON_VERSION%%/lib-tk
 @dirrm lib/%%PYTHON_VERSION%%/lib-old
 @dirrm lib/%%PYTHON_VERSION%%/lib-dynload
-@dirrm lib/%%PYTHON_VERSION%%/hotshot
 @dirrm lib/%%PYTHON_VERSION%%/encodings
-@dirrm lib/%%PYTHON_VERSION%%/email
 @dirrm lib/%%PYTHON_VERSION%%/distutils/command
 @dirrm lib/%%PYTHON_VERSION%%/distutils
 @dirrm lib/%%PYTHON_VERSION%%/curses
 @dirrm lib/%%PYTHON_VERSION%%/config
-@dirrm lib/%%PYTHON_VERSION%%/compiler
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/world
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck
@@ -2603,6 +2379,7 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/i18n
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/freeze
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/faqwiz
+%%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/compiler/compiler
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/compiler
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen/bgen
 %%PORTDOCS%%@dirrm lib/%%PYTHON_VERSION%%/Tools/bgen