From cbee63519e5bfa9431cedefac9d47c9bca12db45 Mon Sep 17 00:00:00 2001
From: Hye-Shik Chang <perky@FreeBSD.org>
Date: Wed, 1 Dec 2004 15:04:05 +0000
Subject: [PATCH] - Update lang/python to 2.4 final release. - Finish repocopy
 lang/python -> lang/python23 for Python 2.3.4

---
 Mk/bsd.python.mk                              |  10 +-
 lang/Makefile                                 |   1 +
 lang/python/Makefile                          |  23 +-
 lang/python/distinfo                          |   8 +-
 .../files/patch-Lib::distutils::spawn.py      |  17 -
 .../python/files/patch-Lib::email::Charset.py |  23 -
 .../files/patch-Lib::plat-freebsd6::IN.py     | 518 ------------------
 lang/python/files/patch-Lib::posixfile.py     |  16 -
 lang/python/files/patch-Makefile.pre.in       |  16 -
 lang/python/files/patch-Python::ceval.c       |   8 +-
 lang/python/files/patch-configure             |  42 --
 lang/python/files/patch-setup.py              |  13 +-
 lang/python/pkg-plist                         | 350 ++++++++++--
 lang/python23/Makefile                        |  14 +-
 lang/python23/distinfo                        |  21 -
 lang/python23/files/patch-setup.py            |  13 +-
 lang/python23/pkg-plist                       |   5 -
 lang/python24/Makefile                        |  23 +-
 lang/python24/distinfo                        |   8 +-
 .../files/patch-Lib::distutils::spawn.py      |  17 -
 .../files/patch-Lib::email::Charset.py        |  23 -
 .../files/patch-Lib::plat-freebsd6::IN.py     | 518 ------------------
 lang/python24/files/patch-Lib::posixfile.py   |  16 -
 lang/python24/files/patch-Makefile.pre.in     |  16 -
 lang/python24/files/patch-Python::ceval.c     |   8 +-
 lang/python24/files/patch-configure           |  42 --
 lang/python24/files/patch-setup.py            |  13 +-
 lang/python24/pkg-plist                       | 350 ++++++++++--
 28 files changed, 692 insertions(+), 1440 deletions(-)
 delete mode 100644 lang/python/files/patch-Lib::distutils::spawn.py
 delete mode 100644 lang/python/files/patch-Lib::email::Charset.py
 delete mode 100644 lang/python/files/patch-Lib::plat-freebsd6::IN.py
 delete mode 100644 lang/python/files/patch-Lib::posixfile.py
 delete mode 100644 lang/python/files/patch-Makefile.pre.in
 delete mode 100644 lang/python/files/patch-configure
 delete mode 100644 lang/python24/files/patch-Lib::distutils::spawn.py
 delete mode 100644 lang/python24/files/patch-Lib::email::Charset.py
 delete mode 100644 lang/python24/files/patch-Lib::plat-freebsd6::IN.py
 delete mode 100644 lang/python24/files/patch-Lib::posixfile.py
 delete mode 100644 lang/python24/files/patch-Makefile.pre.in
 delete mode 100644 lang/python24/files/patch-configure

diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index c951c0f2c61c..2e5843e42266 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -116,8 +116,8 @@ Python_Include_MAINTAINER=	perky@FreeBSD.org
 # PYSETUP:		Name of the setup script used by the distutils package.
 #				default: setup.py
 
-_PYTHON_PORTBRANCH=		2.3
-_PYTHON_ALLBRANCHES=	2.3 2.2 2.1 2.4 # preferred first
+_PYTHON_PORTBRANCH=		2.4
+_PYTHON_ALLBRANCHES=	2.4 2.3 2.2 2.1 # preferred first
 
 .if defined(PYTHON_VERSION)
 _PYTHON_VERSION!=	${ECHO_CMD} "${PYTHON_VERSION}" | ${SED} 's/^python//'
@@ -202,15 +202,15 @@ PYTHON_PORTVERSION=	${_PYTHON_PORTVERSION}
 
 # Python-2.4
 .if ${PYTHON_VERSION} == "python2.4"
-PYTHON_PORTVERSION?=2.4.c1
-PYTHON_PORTSDIR=	${PORTSDIR}/lang/python-devel
+PYTHON_PORTVERSION?=2.4
+PYTHON_PORTSDIR=	${PORTSDIR}/lang/python
 PYTHON_REL=			240
 PYTHON_SUFFIX=		24
 
 # Python-2.3
 .elif ${PYTHON_VERSION} == "python2.3"
 PYTHON_PORTVERSION?=2.3.4
-PYTHON_PORTSDIR=	${PORTSDIR}/lang/python
+PYTHON_PORTSDIR=	${PORTSDIR}/lang/python23
 PYTHON_REL=			234
 PYTHON_SUFFIX=		23
 
diff --git a/lang/Makefile b/lang/Makefile
index 30ecc9c6439d..20f02ad21541 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -210,6 +210,7 @@
     SUBDIR += python-doc-postscript-letter
     SUBDIR += python21
     SUBDIR += python22
+    SUBDIR += python23
     SUBDIR += q
     SUBDIR += qscheme
     SUBDIR += quack
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 504bdc966737..44835915da53 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	2.3.4
-PORTREVISION?=	2
+PORTVERSION=	2.4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -29,7 +28,7 @@ INSTALL_TARGET=	install
 MAN1=		python.1
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.3
+PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
 
@@ -108,21 +107,23 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6
 
 post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3
+		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3
+		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
 pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
-		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
 		${WRKSRC}/Lib/site.py
 	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
 	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
 
-post-configure: ${STACKLESS_POST_CONFIGURE}
+post-configure:
 	@# prepare a subdir for shared build
 .for subdir in Modules Parser Python Objects
 	${MKDIR} ${SHARED_WRKSRC}/${subdir}
@@ -131,6 +132,7 @@ post-configure: ${STACKLESS_POST_CONFIGURE}
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
 		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
 	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
 		${SHARED_WRKSRC}/
@@ -162,8 +164,7 @@ post-install:
 		${PREFIX}/lib
 	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
 		lib${PYTHON_VERSION}.so
-	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so \
-		${PYTHONPREFIX_LIBDIR}/config
+	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
@@ -173,8 +174,8 @@ post-install:
 	@# additional files installing by ports
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
-	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
-		${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
+		${WRKDIR}/smtpd2.4.py ${PREFIX}/bin
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
diff --git a/lang/python/distinfo b/lang/python/distinfo
index ecafbcf9c5ae..ea1578781569 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1,7 +1,3 @@
-MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
-MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
-MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
-MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79
 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
 MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4
 MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9
@@ -17,7 +13,7 @@ MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
 SIZE (python/Python-2.3.3.tgz) = 8491380
 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
 SIZE (python/Python-2.3.4.tgz) = 8502738
-MD5 (python/Python-2.4b2.tgz) = 25b99930080ff5f4072c0229f93382fc
-SIZE (python/Python-2.4b2.tgz) = 9190198
 MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac
 SIZE (python/Python-2.4c1.tgz) = 9198160
+MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
+SIZE (python/Python-2.4.tgz) = 9198035
diff --git a/lang/python/files/patch-Lib::distutils::spawn.py b/lang/python/files/patch-Lib::distutils::spawn.py
deleted file mode 100644
index 208b10fc1083..000000000000
--- a/lang/python/files/patch-Lib::distutils::spawn.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- Lib/distutils/spawn.py.orig	Tue Feb 24 16:55:44 2004
-+++ Lib/distutils/spawn.py	Tue Feb 24 16:56:01 2004
-@@ -144,7 +144,13 @@
-         # Loop until the child either exits or is terminated by a signal
-         # (ie. keep waiting if it's merely stopped)
-         while 1:
--            (pid, status) = os.waitpid(pid, 0)
-+            try:
-+                (pid, status) = os.waitpid(pid, 0)
-+            except OSError, exc:
-+                import errno
-+                if exc.errno == errno.EINTR:
-+                    continue
-+                raise exc
-             if os.WIFSIGNALED(status):
-                 raise DistutilsExecError, \
-                       "command '%s' terminated by signal %d" % \
diff --git a/lang/python/files/patch-Lib::email::Charset.py b/lang/python/files/patch-Lib::email::Charset.py
deleted file mode 100644
index 31063a951a80..000000000000
--- a/lang/python/files/patch-Lib::email::Charset.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- Lib/email/Charset.py.orig	Sat Dec 20 15:16:29 2003
-+++ Lib/email/Charset.py	Sat Dec 20 15:16:54 2003
-@@ -99,13 +99,13 @@
- # of stability and useability.
- 
- CODEC_MAP = {
--    'euc-jp':      'japanese.euc-jp',
--    'iso-2022-jp': 'japanese.iso-2022-jp',
--    'shift_jis':   'japanese.shift_jis',
--    'euc-kr':      'korean.euc-kr',
--    'ks_c_5601-1987': 'korean.cp949',
--    'iso-2022-kr': 'korean.iso-2022-kr',
--    'johab':       'korean.johab',
-+    'euc-jp':      'euc-jp',
-+    'iso-2022-jp': 'iso-2022-jp',
-+    'shift_jis':   'shift_jis',
-+    'euc-kr':      'euc-kr',
-+    'ks_c_5601-1987': 'cp949',
-+    'iso-2022-kr': 'iso-2022-kr',
-+    'johab':       'johab',
-     'gb2132':      'eucgb2312_cn',
-     'big5':        'big5_tw',
-     'utf-8':       'utf-8',
diff --git a/lang/python/files/patch-Lib::plat-freebsd6::IN.py b/lang/python/files/patch-Lib::plat-freebsd6::IN.py
deleted file mode 100644
index 8316a9ef20a0..000000000000
--- a/lang/python/files/patch-Lib::plat-freebsd6::IN.py
+++ /dev/null
@@ -1,518 +0,0 @@
---- Lib/plat-freebsd6/IN.py	Thu Jan  1 09:00:00 1970
-+++ Lib/plat-freebsd6/IN.py	Sat Aug 21 08:09:15 2004
-@@ -0,0 +1,515 @@
-+# Generated by h2py from /usr/include/netinet/in.h
-+
-+# Included from sys/cdefs.h
-+def __P(protos): return protos
-+
-+def __STRING(x): return #x
-+
-+def __XSTRING(x): return __STRING(x)
-+
-+def __P(protos): return ()
-+
-+def __STRING(x): return "x"
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __nonnull(x): return __attribute__((__nonnull__(x)))
-+
-+def __predict_true(exp): return __builtin_expect((exp), 1)
-+
-+def __predict_false(exp): return __builtin_expect((exp), 0)
-+
-+def __predict_true(exp): return (exp)
-+
-+def __predict_false(exp): return (exp)
-+
-+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-+
-+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-+
-+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-+
-+_POSIX_C_SOURCE = 199009
-+_POSIX_C_SOURCE = 199209
-+__XSI_VISIBLE = 600
-+_POSIX_C_SOURCE = 200112
-+__XSI_VISIBLE = 500
-+_POSIX_C_SOURCE = 199506
-+_POSIX_C_SOURCE = 198808
-+__POSIX_VISIBLE = 200112
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 199506
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199309
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199209
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199009
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 198808
-+__ISO_C_VISIBLE = 0
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 200112
-+__XSI_VISIBLE = 600
-+__BSD_VISIBLE = 1
-+__ISO_C_VISIBLE = 1999
-+
-+# Included from sys/_types.h
-+
-+# Included from machine/_types.h
-+
-+# Included from machine/endian.h
-+_QUAD_HIGHWORD = 1
-+_QUAD_LOWWORD = 0
-+_LITTLE_ENDIAN = 1234
-+_BIG_ENDIAN = 4321
-+_PDP_ENDIAN = 3412
-+_BYTE_ORDER = _LITTLE_ENDIAN
-+LITTLE_ENDIAN = _LITTLE_ENDIAN
-+BIG_ENDIAN = _BIG_ENDIAN
-+PDP_ENDIAN = _PDP_ENDIAN
-+BYTE_ORDER = _BYTE_ORDER
-+__INTEL_COMPILER_with_FreeBSD_endian = 1
-+__INTEL_COMPILER_with_FreeBSD_endian = 1
-+def __word_swap_int_var(x): return \
-+
-+def __word_swap_int_const(x): return \
-+
-+def __word_swap_int(x): return __word_swap_int_var(x)
-+
-+def __byte_swap_int_var(x): return \
-+
-+def __byte_swap_int_var(x): return \
-+
-+def __byte_swap_int_const(x): return \
-+
-+def __byte_swap_int(x): return __byte_swap_int_var(x)
-+
-+def __byte_swap_word_var(x): return \
-+
-+def __byte_swap_word_const(x): return \
-+
-+def __byte_swap_word(x): return __byte_swap_word_var(x)
-+
-+def __htonl(x): return __bswap32(x)
-+
-+def __htons(x): return __bswap16(x)
-+
-+def __ntohl(x): return __bswap32(x)
-+
-+def __ntohs(x): return __bswap16(x)
-+
-+IPPROTO_IP = 0
-+IPPROTO_ICMP = 1
-+IPPROTO_TCP = 6
-+IPPROTO_UDP = 17
-+def htonl(x): return __htonl(x)
-+
-+def htons(x): return __htons(x)
-+
-+def ntohl(x): return __ntohl(x)
-+
-+def ntohs(x): return __ntohs(x)
-+
-+IPPROTO_RAW = 255
-+INET_ADDRSTRLEN = 16
-+IPPROTO_HOPOPTS = 0
-+IPPROTO_IGMP = 2
-+IPPROTO_GGP = 3
-+IPPROTO_IPV4 = 4
-+IPPROTO_IPIP = IPPROTO_IPV4
-+IPPROTO_ST = 7
-+IPPROTO_EGP = 8
-+IPPROTO_PIGP = 9
-+IPPROTO_RCCMON = 10
-+IPPROTO_NVPII = 11
-+IPPROTO_PUP = 12
-+IPPROTO_ARGUS = 13
-+IPPROTO_EMCON = 14
-+IPPROTO_XNET = 15
-+IPPROTO_CHAOS = 16
-+IPPROTO_MUX = 18
-+IPPROTO_MEAS = 19
-+IPPROTO_HMP = 20
-+IPPROTO_PRM = 21
-+IPPROTO_IDP = 22
-+IPPROTO_TRUNK1 = 23
-+IPPROTO_TRUNK2 = 24
-+IPPROTO_LEAF1 = 25
-+IPPROTO_LEAF2 = 26
-+IPPROTO_RDP = 27
-+IPPROTO_IRTP = 28
-+IPPROTO_TP = 29
-+IPPROTO_BLT = 30
-+IPPROTO_NSP = 31
-+IPPROTO_INP = 32
-+IPPROTO_SEP = 33
-+IPPROTO_3PC = 34
-+IPPROTO_IDPR = 35
-+IPPROTO_XTP = 36
-+IPPROTO_DDP = 37
-+IPPROTO_CMTP = 38
-+IPPROTO_TPXX = 39
-+IPPROTO_IL = 40
-+IPPROTO_IPV6 = 41
-+IPPROTO_SDRP = 42
-+IPPROTO_ROUTING = 43
-+IPPROTO_FRAGMENT = 44
-+IPPROTO_IDRP = 45
-+IPPROTO_RSVP = 46
-+IPPROTO_GRE = 47
-+IPPROTO_MHRP = 48
-+IPPROTO_BHA = 49
-+IPPROTO_ESP = 50
-+IPPROTO_AH = 51
-+IPPROTO_INLSP = 52
-+IPPROTO_SWIPE = 53
-+IPPROTO_NHRP = 54
-+IPPROTO_MOBILE = 55
-+IPPROTO_TLSP = 56
-+IPPROTO_SKIP = 57
-+IPPROTO_ICMPV6 = 58
-+IPPROTO_NONE = 59
-+IPPROTO_DSTOPTS = 60
-+IPPROTO_AHIP = 61
-+IPPROTO_CFTP = 62
-+IPPROTO_HELLO = 63
-+IPPROTO_SATEXPAK = 64
-+IPPROTO_KRYPTOLAN = 65
-+IPPROTO_RVD = 66
-+IPPROTO_IPPC = 67
-+IPPROTO_ADFS = 68
-+IPPROTO_SATMON = 69
-+IPPROTO_VISA = 70
-+IPPROTO_IPCV = 71
-+IPPROTO_CPNX = 72
-+IPPROTO_CPHB = 73
-+IPPROTO_WSN = 74
-+IPPROTO_PVP = 75
-+IPPROTO_BRSATMON = 76
-+IPPROTO_ND = 77
-+IPPROTO_WBMON = 78
-+IPPROTO_WBEXPAK = 79
-+IPPROTO_EON = 80
-+IPPROTO_VMTP = 81
-+IPPROTO_SVMTP = 82
-+IPPROTO_VINES = 83
-+IPPROTO_TTP = 84
-+IPPROTO_IGP = 85
-+IPPROTO_DGP = 86
-+IPPROTO_TCF = 87
-+IPPROTO_IGRP = 88
-+IPPROTO_OSPFIGP = 89
-+IPPROTO_SRPC = 90
-+IPPROTO_LARP = 91
-+IPPROTO_MTP = 92
-+IPPROTO_AX25 = 93
-+IPPROTO_IPEIP = 94
-+IPPROTO_MICP = 95
-+IPPROTO_SCCSP = 96
-+IPPROTO_ETHERIP = 97
-+IPPROTO_ENCAP = 98
-+IPPROTO_APES = 99
-+IPPROTO_GMTP = 100
-+IPPROTO_IPCOMP = 108
-+IPPROTO_PIM = 103
-+IPPROTO_PGM = 113
-+IPPROTO_PFSYNC = 240
-+IPPROTO_OLD_DIVERT = 254
-+IPPROTO_MAX = 256
-+IPPROTO_DONE = 257
-+IPPROTO_DIVERT = 258
-+IPPORT_RESERVED = 1024
-+IPPORT_HIFIRSTAUTO = 49152
-+IPPORT_HILASTAUTO = 65535
-+IPPORT_RESERVEDSTART = 600
-+IPPORT_MAX = 65535
-+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0)
-+
-+IN_CLASSA_NET = (-16777216)
-+IN_CLASSA_NSHIFT = 24
-+IN_CLASSA_HOST = 0x00ffffff
-+IN_CLASSA_MAX = 128
-+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648))
-+
-+IN_CLASSB_NET = (-65536)
-+IN_CLASSB_NSHIFT = 16
-+IN_CLASSB_HOST = 0x0000ffff
-+IN_CLASSB_MAX = 65536
-+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824))
-+
-+IN_CLASSC_NET = (-256)
-+IN_CLASSC_NSHIFT = 8
-+IN_CLASSC_HOST = 0x000000ff
-+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912))
-+
-+IN_CLASSD_NET = (-268435456)
-+IN_CLASSD_NSHIFT = 28
-+IN_CLASSD_HOST = 0x0fffffff
-+def IN_MULTICAST(i): return IN_CLASSD(i)
-+
-+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+INADDR_NONE = (-1)
-+IN_LOOPBACKNET = 127
-+IP_OPTIONS = 1
-+IP_HDRINCL = 2
-+IP_TOS = 3
-+IP_TTL = 4
-+IP_RECVOPTS = 5
-+IP_RECVRETOPTS = 6
-+IP_RECVDSTADDR = 7
-+IP_SENDSRCADDR = IP_RECVDSTADDR
-+IP_RETOPTS = 8
-+IP_MULTICAST_IF = 9
-+IP_MULTICAST_TTL = 10
-+IP_MULTICAST_LOOP = 11
-+IP_ADD_MEMBERSHIP = 12
-+IP_DROP_MEMBERSHIP = 13
-+IP_MULTICAST_VIF = 14
-+IP_RSVP_ON = 15
-+IP_RSVP_OFF = 16
-+IP_RSVP_VIF_ON = 17
-+IP_RSVP_VIF_OFF = 18
-+IP_PORTRANGE = 19
-+IP_RECVIF = 20
-+IP_IPSEC_POLICY = 21
-+IP_FAITH = 22
-+IP_ONESBCAST = 23
-+IP_FW_TABLE_ADD = 40
-+IP_FW_TABLE_DEL = 41
-+IP_FW_TABLE_FLUSH = 42
-+IP_FW_TABLE_GETSIZE = 43
-+IP_FW_TABLE_LIST = 44
-+IP_FW_ADD = 50
-+IP_FW_DEL = 51
-+IP_FW_FLUSH = 52
-+IP_FW_ZERO = 53
-+IP_FW_GET = 54
-+IP_FW_RESETLOG = 55
-+IP_DUMMYNET_CONFIGURE = 60
-+IP_DUMMYNET_DEL = 61
-+IP_DUMMYNET_FLUSH = 62
-+IP_DUMMYNET_GET = 64
-+IP_RECVTTL = 65
-+IP_DEFAULT_MULTICAST_TTL = 1
-+IP_DEFAULT_MULTICAST_LOOP = 1
-+IP_MAX_MEMBERSHIPS = 20
-+IP_PORTRANGE_DEFAULT = 0
-+IP_PORTRANGE_HIGH = 1
-+IP_PORTRANGE_LOW = 2
-+IPPROTO_MAXID = (IPPROTO_AH + 1)
-+IPCTL_FORWARDING = 1
-+IPCTL_SENDREDIRECTS = 2
-+IPCTL_DEFTTL = 3
-+IPCTL_DEFMTU = 4
-+IPCTL_RTEXPIRE = 5
-+IPCTL_RTMINEXPIRE = 6
-+IPCTL_RTMAXCACHE = 7
-+IPCTL_SOURCEROUTE = 8
-+IPCTL_DIRECTEDBROADCAST = 9
-+IPCTL_INTRQMAXLEN = 10
-+IPCTL_INTRQDROPS = 11
-+IPCTL_STATS = 12
-+IPCTL_ACCEPTSOURCEROUTE = 13
-+IPCTL_FASTFORWARDING = 14
-+IPCTL_KEEPFAITH = 15
-+IPCTL_GIF_TTL = 16
-+IPCTL_MAXID = 17
-+def in_nullhost(x): return ((x).s_addr == INADDR_ANY)
-+
-+
-+# Included from netinet6/in6.h
-+__KAME_VERSION = "20010528/FreeBSD"
-+IPV6PORT_RESERVED = 1024
-+IPV6PORT_ANONMIN = 49152
-+IPV6PORT_ANONMAX = 65535
-+IPV6PORT_RESERVEDMIN = 600
-+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-+INET6_ADDRSTRLEN = 46
-+IPV6_ADDR_INT32_ONE = 1
-+IPV6_ADDR_INT32_TWO = 2
-+IPV6_ADDR_INT32_MNL = (-16711680)
-+IPV6_ADDR_INT32_MLL = (-16646144)
-+IPV6_ADDR_INT32_SMP = 0x0000ffff
-+IPV6_ADDR_INT16_ULL = 0xfe80
-+IPV6_ADDR_INT16_USL = 0xfec0
-+IPV6_ADDR_INT16_MLL = 0xff02
-+IPV6_ADDR_INT32_ONE = 0x01000000
-+IPV6_ADDR_INT32_TWO = 0x02000000
-+IPV6_ADDR_INT32_MNL = 0x000001ff
-+IPV6_ADDR_INT32_MLL = 0x000002ff
-+IPV6_ADDR_INT32_SMP = (-65536)
-+IPV6_ADDR_INT16_ULL = 0x80fe
-+IPV6_ADDR_INT16_USL = 0xc0fe
-+IPV6_ADDR_INT16_MLL = 0x02ff
-+def IN6_IS_ADDR_UNSPECIFIED(a): return \
-+
-+def IN6_IS_ADDR_LOOPBACK(a): return \
-+
-+def IN6_IS_ADDR_V4COMPAT(a): return \
-+
-+def IN6_IS_ADDR_V4MAPPED(a): return \
-+
-+IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+def IN6_IS_ADDR_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_SCOPE_LINKLOCAL(a): return \
-+
-+def IFA6_IS_DEPRECATED(a): return \
-+
-+def IFA6_IS_INVALID(a): return \
-+
-+IPV6_OPTIONS = 1
-+IPV6_RECVOPTS = 5
-+IPV6_RECVRETOPTS = 6
-+IPV6_RECVDSTADDR = 7
-+IPV6_RETOPTS = 8
-+IPV6_SOCKOPT_RESERVED1 = 3
-+IPV6_UNICAST_HOPS = 4
-+IPV6_MULTICAST_IF = 9
-+IPV6_MULTICAST_HOPS = 10
-+IPV6_MULTICAST_LOOP = 11
-+IPV6_JOIN_GROUP = 12
-+IPV6_LEAVE_GROUP = 13
-+IPV6_PORTRANGE = 14
-+ICMP6_FILTER = 18
-+IPV6_2292PKTINFO = 19
-+IPV6_2292HOPLIMIT = 20
-+IPV6_2292NEXTHOP = 21
-+IPV6_2292HOPOPTS = 22
-+IPV6_2292DSTOPTS = 23
-+IPV6_2292RTHDR = 24
-+IPV6_2292PKTOPTIONS = 25
-+IPV6_CHECKSUM = 26
-+IPV6_V6ONLY = 27
-+IPV6_BINDV6ONLY = IPV6_V6ONLY
-+IPV6_IPSEC_POLICY = 28
-+IPV6_FAITH = 29
-+IPV6_FW_ADD = 30
-+IPV6_FW_DEL = 31
-+IPV6_FW_FLUSH = 32
-+IPV6_FW_ZERO = 33
-+IPV6_FW_GET = 34
-+IPV6_RTHDRDSTOPTS = 35
-+IPV6_RECVPKTINFO = 36
-+IPV6_RECVHOPLIMIT = 37
-+IPV6_RECVRTHDR = 38
-+IPV6_RECVHOPOPTS = 39
-+IPV6_RECVDSTOPTS = 40
-+IPV6_RECVRTHDRDSTOPTS = 41
-+IPV6_USE_MIN_MTU = 42
-+IPV6_RECVPATHMTU = 43
-+IPV6_PATHMTU = 44
-+IPV6_REACHCONF = 45
-+IPV6_PKTINFO = 46
-+IPV6_HOPLIMIT = 47
-+IPV6_NEXTHOP = 48
-+IPV6_HOPOPTS = 49
-+IPV6_DSTOPTS = 50
-+IPV6_RTHDR = 51
-+IPV6_PKTOPTIONS = 52
-+IPV6_RECVTCLASS = 57
-+IPV6_AUTOFLOWLABEL = 59
-+IPV6_TCLASS = 61
-+IPV6_DONTFRAG = 62
-+IPV6_PREFER_TEMPADDR = 63
-+IPV6_RTHDR_LOOSE = 0
-+IPV6_RTHDR_STRICT = 1
-+IPV6_RTHDR_TYPE_0 = 0
-+IPV6_DEFAULT_MULTICAST_HOPS = 1
-+IPV6_DEFAULT_MULTICAST_LOOP = 1
-+IPV6_PORTRANGE_DEFAULT = 0
-+IPV6_PORTRANGE_HIGH = 1
-+IPV6_PORTRANGE_LOW = 2
-+IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-+IPV6CTL_FORWARDING = 1
-+IPV6CTL_SENDREDIRECTS = 2
-+IPV6CTL_DEFHLIM = 3
-+IPV6CTL_DEFMTU = 4
-+IPV6CTL_FORWSRCRT = 5
-+IPV6CTL_STATS = 6
-+IPV6CTL_MRTSTATS = 7
-+IPV6CTL_MRTPROTO = 8
-+IPV6CTL_MAXFRAGPACKETS = 9
-+IPV6CTL_SOURCECHECK = 10
-+IPV6CTL_SOURCECHECK_LOGINT = 11
-+IPV6CTL_ACCEPT_RTADV = 12
-+IPV6CTL_KEEPFAITH = 13
-+IPV6CTL_LOG_INTERVAL = 14
-+IPV6CTL_HDRNESTLIMIT = 15
-+IPV6CTL_DAD_COUNT = 16
-+IPV6CTL_AUTO_FLOWLABEL = 17
-+IPV6CTL_DEFMCASTHLIM = 18
-+IPV6CTL_GIF_HLIM = 19
-+IPV6CTL_KAME_VERSION = 20
-+IPV6CTL_USE_DEPRECATED = 21
-+IPV6CTL_RR_PRUNE = 22
-+IPV6CTL_MAPPED_ADDR = 23
-+IPV6CTL_V6ONLY = 24
-+IPV6CTL_RTEXPIRE = 25
-+IPV6CTL_RTMINEXPIRE = 26
-+IPV6CTL_RTMAXCACHE = 27
-+IPV6CTL_USETEMPADDR = 32
-+IPV6CTL_TEMPPLTIME = 33
-+IPV6CTL_TEMPVLTIME = 34
-+IPV6CTL_AUTO_LINKLOCAL = 35
-+IPV6CTL_RIP6STATS = 36
-+IPV6CTL_PREFER_TEMPADDR = 37
-+IPV6CTL_ADDRCTLPOLICY = 38
-+IPV6CTL_MAXFRAGS = 41
-+IPV6CTL_MAXID = 42
diff --git a/lang/python/files/patch-Lib::posixfile.py b/lang/python/files/patch-Lib::posixfile.py
deleted file mode 100644
index 59ce175a895d..000000000000
--- a/lang/python/files/patch-Lib::posixfile.py
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Lib/posixfile.py,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -r1.25 -r1.26
---- Lib/posixfile.py	2004/02/12 17:35:06	1.25
-+++ Lib/posixfile.py	2004/08/18 15:13:40	1.26
-@@ -185,7 +185,7 @@
-         if sys.platform in ('netbsd1',
-                             'openbsd2',
-                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
--                            'bsdos2', 'bsdos3', 'bsdos4'):
-+                            'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
-             flock = struct.pack('lxxxxlxxxxlhh', \
-                   l_start, l_len, os.getpid(), l_type, l_whence)
-         elif sys.platform in ['aix3', 'aix4']:
diff --git a/lang/python/files/patch-Makefile.pre.in b/lang/python/files/patch-Makefile.pre.in
deleted file mode 100644
index 8ab09bec3ba2..000000000000
--- a/lang/python/files/patch-Makefile.pre.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.pre.in.orig	Sat Nov 15 21:37:25 2003
-+++ Makefile.pre.in	Sat Nov 15 21:37:54 2003
-@@ -710,11 +710,11 @@
- 		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
--	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
diff --git a/lang/python/files/patch-Python::ceval.c b/lang/python/files/patch-Python::ceval.c
index fc42c6e58d51..057d4b6a066e 100644
--- a/lang/python/files/patch-Python::ceval.c
+++ b/lang/python/files/patch-Python::ceval.c
@@ -1,14 +1,16 @@
---- Python/ceval.c.orig	Sat Dec 20 15:13:53 2003
-+++ Python/ceval.c	Sat Dec 20 15:15:46 2003
-@@ -496,7 +496,10 @@
+--- Python/ceval.c.orig	Wed Nov 24 03:06:08 2004
++++ Python/ceval.c	Wed Dec  1 22:29:37 2004
+@@ -414,8 +414,11 @@
  
  /* The interpreter's recursion limit */
  
 -static int recursion_limit = 1000;
+-int _Py_CheckRecursionLimit = 1000;
 +#ifndef PYTHON_DEFAULT_RECURSION_LIMIT
 +#define PYTHON_DEFAULT_RECURSION_LIMIT 1000
 +#endif
 +static int recursion_limit = PYTHON_DEFAULT_RECURSION_LIMIT;
++int _Py_CheckRecursionLimit = PYTHON_DEFAULT_RECURSION_LIMIT;
  
  int
  Py_GetRecursionLimit(void)
diff --git a/lang/python/files/patch-configure b/lang/python/files/patch-configure
deleted file mode 100644
index fe9629450d08..000000000000
--- a/lang/python/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	Sat May  8 04:13:40 2004
-+++ configure	Fri Jun  4 14:15:59 2004
-@@ -1321,7 +1321,7 @@
- VERSION=2.3
- 
- 
--SOVERSION=1.0
-+SOVERSION=1
- 
- # The later defininition of _XOPEN_SOURCE disables certain features
- # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -3609,6 +3609,12 @@
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  ;;
-+    FreeBSD*)
-+	  LDLIBRARY='libpython$(VERSION).so'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY".$SOVERSION
-+	  ;;
-     hp*|HP*)
- 	  LDLIBRARY='libpython$(VERSION).sl'
- 	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -10100,7 +10106,7 @@
- 	OpenBSD*|FreeBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
--			LDSHARED="cc -shared ${LDFLAGS}"
-+			LDSHARED="$CC -shared ${LDFLAGS}"
- 		else
- 			LDSHARED="ld -Bshareable ${LDFLAGS}"
- 		fi;;
-@@ -12273,7 +12279,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_pthread_system_supported=yes
-+  ac_cv_pthread_system_supported="ignored by port"
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
diff --git a/lang/python/files/patch-setup.py b/lang/python/files/patch-setup.py
index 42d6b9a68984..7a4e76912d96 100644
--- a/lang/python/files/patch-setup.py
+++ b/lang/python/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Sat Aug 21 08:12:35 2004
-+++ setup.py	Sat Aug 21 08:12:48 2004
+--- setup.py.orig      Tue Aug 31 10:37:25 2004
++++ setup.py   Fri Sep  3 10:42:53 2004
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -9,12 +9,3 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -770,7 +770,7 @@
-             # Linux-specific modules
-             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
- 
--        if platform in ('linux2', 'freebsd4'):
-+        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
-             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
- 
-         if platform == 'sunos5':
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index a8d752d69a4b..e5c240cebb72 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/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
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 504bdc966737..d27ce95f103e 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -25,13 +25,14 @@ CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
 INSTALLS_SHLIB=	yes
-INSTALL_TARGET=	install
-MAN1=		python.1
+INSTALL_TARGET=	altinstall
+MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
+LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${WRKSRC}/build.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
@@ -160,6 +161,9 @@ post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
 		${PREFIX}/lib
+	@${MKDIR} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
 		lib${PYTHON_VERSION}.so
 	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so \
@@ -167,12 +171,8 @@ post-install:
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
-	cd ${PREFIX}/bin; \
-		${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared
 
 	@# additional files installing by ports
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
-		${PREFIX}/share/emacs/site-lisp
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
 		${PREFIX}/bin
 
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index ecafbcf9c5ae..bff74d31dc32 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,23 +1,2 @@
-MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
-MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
-MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
-MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79
-MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
-MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4
-MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9
-MD5 (python/Python-2.1.3.tgz) = a8b04cdc822a6fc833ed9b99c7fba589
-MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
-MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
-MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8
-MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae
-MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479
-MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
-SIZE (python/Python-2.3.3.tgz) = 8491380
 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
 SIZE (python/Python-2.3.4.tgz) = 8502738
-MD5 (python/Python-2.4b2.tgz) = 25b99930080ff5f4072c0229f93382fc
-SIZE (python/Python-2.4b2.tgz) = 9190198
-MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac
-SIZE (python/Python-2.4c1.tgz) = 9198160
diff --git a/lang/python23/files/patch-setup.py b/lang/python23/files/patch-setup.py
index 42d6b9a68984..c97c8ad2cadf 100644
--- a/lang/python23/files/patch-setup.py
+++ b/lang/python23/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Sat Aug 21 08:12:35 2004
-+++ setup.py	Sat Aug 21 08:12:48 2004
+--- setup.py.orig	Wed Oct 22 05:01:21 2003
++++ setup.py	Wed Dec  1 23:07:00 2004
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -18,3 +18,12 @@
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
  
          if platform == 'sunos5':
+@@ -1140,7 +1140,7 @@
+           ext_modules=[Extension('struct', ['structmodule.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle']
++          scripts = []
+         )
+ 
+ # --install-platlib
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index a8d752d69a4b..028ff26be75d 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -1,10 +1,6 @@
-bin/idle
 bin/idle%%PYVER%%
-bin/pydoc
 bin/pydoc%%PYVER%%
-bin/python
 bin/python%%PYVER%%
-bin/python-shared
 bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
@@ -2583,7 +2579,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo
 lib/%%PYTHON_VERSION%%/zipfile.py
 lib/%%PYTHON_VERSION%%/zipfile.pyc
 lib/%%PYTHON_VERSION%%/zipfile.pyo
-share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 504bdc966737..44835915da53 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	2.3.4
-PORTREVISION?=	2
+PORTVERSION=	2.4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -29,7 +28,7 @@ INSTALL_TARGET=	install
 MAN1=		python.1
 
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.3
+PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
 
@@ -108,21 +107,23 @@ PLATFORMS=plat-freebsd4 plat-freebsd5 plat-freebsd6
 
 post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3
+		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.4
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3
+		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
 pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
-		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
 		${WRKSRC}/Lib/site.py
 	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
 	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
 
-post-configure: ${STACKLESS_POST_CONFIGURE}
+post-configure:
 	@# prepare a subdir for shared build
 .for subdir in Modules Parser Python Objects
 	${MKDIR} ${SHARED_WRKSRC}/${subdir}
@@ -131,6 +132,7 @@ post-configure: ${STACKLESS_POST_CONFIGURE}
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
 		-e 's,^\(Makefile Modules/config.c:.*\)Makefile.pre,\1,' \
+		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
 	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
 		${SHARED_WRKSRC}/
@@ -162,8 +164,7 @@ post-install:
 		${PREFIX}/lib
 	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
 		lib${PYTHON_VERSION}.so
-	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so \
-		${PYTHONPREFIX_LIBDIR}/config
+	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
@@ -173,8 +174,8 @@ post-install:
 	@# additional files installing by ports
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
-	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
-		${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
+		${WRKDIR}/smtpd2.4.py ${PREFIX}/bin
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index ecafbcf9c5ae..ea1578781569 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,7 +1,3 @@
-MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
-MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
-MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
-MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79
 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
 MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4
 MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9
@@ -17,7 +13,7 @@ MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
 SIZE (python/Python-2.3.3.tgz) = 8491380
 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
 SIZE (python/Python-2.3.4.tgz) = 8502738
-MD5 (python/Python-2.4b2.tgz) = 25b99930080ff5f4072c0229f93382fc
-SIZE (python/Python-2.4b2.tgz) = 9190198
 MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac
 SIZE (python/Python-2.4c1.tgz) = 9198160
+MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
+SIZE (python/Python-2.4.tgz) = 9198035
diff --git a/lang/python24/files/patch-Lib::distutils::spawn.py b/lang/python24/files/patch-Lib::distutils::spawn.py
deleted file mode 100644
index 208b10fc1083..000000000000
--- a/lang/python24/files/patch-Lib::distutils::spawn.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- Lib/distutils/spawn.py.orig	Tue Feb 24 16:55:44 2004
-+++ Lib/distutils/spawn.py	Tue Feb 24 16:56:01 2004
-@@ -144,7 +144,13 @@
-         # Loop until the child either exits or is terminated by a signal
-         # (ie. keep waiting if it's merely stopped)
-         while 1:
--            (pid, status) = os.waitpid(pid, 0)
-+            try:
-+                (pid, status) = os.waitpid(pid, 0)
-+            except OSError, exc:
-+                import errno
-+                if exc.errno == errno.EINTR:
-+                    continue
-+                raise exc
-             if os.WIFSIGNALED(status):
-                 raise DistutilsExecError, \
-                       "command '%s' terminated by signal %d" % \
diff --git a/lang/python24/files/patch-Lib::email::Charset.py b/lang/python24/files/patch-Lib::email::Charset.py
deleted file mode 100644
index 31063a951a80..000000000000
--- a/lang/python24/files/patch-Lib::email::Charset.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- Lib/email/Charset.py.orig	Sat Dec 20 15:16:29 2003
-+++ Lib/email/Charset.py	Sat Dec 20 15:16:54 2003
-@@ -99,13 +99,13 @@
- # of stability and useability.
- 
- CODEC_MAP = {
--    'euc-jp':      'japanese.euc-jp',
--    'iso-2022-jp': 'japanese.iso-2022-jp',
--    'shift_jis':   'japanese.shift_jis',
--    'euc-kr':      'korean.euc-kr',
--    'ks_c_5601-1987': 'korean.cp949',
--    'iso-2022-kr': 'korean.iso-2022-kr',
--    'johab':       'korean.johab',
-+    'euc-jp':      'euc-jp',
-+    'iso-2022-jp': 'iso-2022-jp',
-+    'shift_jis':   'shift_jis',
-+    'euc-kr':      'euc-kr',
-+    'ks_c_5601-1987': 'cp949',
-+    'iso-2022-kr': 'iso-2022-kr',
-+    'johab':       'johab',
-     'gb2132':      'eucgb2312_cn',
-     'big5':        'big5_tw',
-     'utf-8':       'utf-8',
diff --git a/lang/python24/files/patch-Lib::plat-freebsd6::IN.py b/lang/python24/files/patch-Lib::plat-freebsd6::IN.py
deleted file mode 100644
index 8316a9ef20a0..000000000000
--- a/lang/python24/files/patch-Lib::plat-freebsd6::IN.py
+++ /dev/null
@@ -1,518 +0,0 @@
---- Lib/plat-freebsd6/IN.py	Thu Jan  1 09:00:00 1970
-+++ Lib/plat-freebsd6/IN.py	Sat Aug 21 08:09:15 2004
-@@ -0,0 +1,515 @@
-+# Generated by h2py from /usr/include/netinet/in.h
-+
-+# Included from sys/cdefs.h
-+def __P(protos): return protos
-+
-+def __STRING(x): return #x
-+
-+def __XSTRING(x): return __STRING(x)
-+
-+def __P(protos): return ()
-+
-+def __STRING(x): return "x"
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __aligned(x): return __attribute__((__aligned__(x)))
-+
-+def __section(x): return __attribute__((__section__(x)))
-+
-+def __nonnull(x): return __attribute__((__nonnull__(x)))
-+
-+def __predict_true(exp): return __builtin_expect((exp), 1)
-+
-+def __predict_false(exp): return __builtin_expect((exp), 0)
-+
-+def __predict_true(exp): return (exp)
-+
-+def __predict_false(exp): return (exp)
-+
-+def __FBSDID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID(s): return __IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-+
-+def __RCSID_SOURCE(s): return __IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-+
-+def __SCCSID(s): return __IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-+
-+def __COPYRIGHT(s): return __IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-+
-+_POSIX_C_SOURCE = 199009
-+_POSIX_C_SOURCE = 199209
-+__XSI_VISIBLE = 600
-+_POSIX_C_SOURCE = 200112
-+__XSI_VISIBLE = 500
-+_POSIX_C_SOURCE = 199506
-+_POSIX_C_SOURCE = 198808
-+__POSIX_VISIBLE = 200112
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 199506
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199309
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199209
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 199009
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 198808
-+__ISO_C_VISIBLE = 0
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1990
-+__POSIX_VISIBLE = 0
-+__XSI_VISIBLE = 0
-+__BSD_VISIBLE = 0
-+__ISO_C_VISIBLE = 1999
-+__POSIX_VISIBLE = 200112
-+__XSI_VISIBLE = 600
-+__BSD_VISIBLE = 1
-+__ISO_C_VISIBLE = 1999
-+
-+# Included from sys/_types.h
-+
-+# Included from machine/_types.h
-+
-+# Included from machine/endian.h
-+_QUAD_HIGHWORD = 1
-+_QUAD_LOWWORD = 0
-+_LITTLE_ENDIAN = 1234
-+_BIG_ENDIAN = 4321
-+_PDP_ENDIAN = 3412
-+_BYTE_ORDER = _LITTLE_ENDIAN
-+LITTLE_ENDIAN = _LITTLE_ENDIAN
-+BIG_ENDIAN = _BIG_ENDIAN
-+PDP_ENDIAN = _PDP_ENDIAN
-+BYTE_ORDER = _BYTE_ORDER
-+__INTEL_COMPILER_with_FreeBSD_endian = 1
-+__INTEL_COMPILER_with_FreeBSD_endian = 1
-+def __word_swap_int_var(x): return \
-+
-+def __word_swap_int_const(x): return \
-+
-+def __word_swap_int(x): return __word_swap_int_var(x)
-+
-+def __byte_swap_int_var(x): return \
-+
-+def __byte_swap_int_var(x): return \
-+
-+def __byte_swap_int_const(x): return \
-+
-+def __byte_swap_int(x): return __byte_swap_int_var(x)
-+
-+def __byte_swap_word_var(x): return \
-+
-+def __byte_swap_word_const(x): return \
-+
-+def __byte_swap_word(x): return __byte_swap_word_var(x)
-+
-+def __htonl(x): return __bswap32(x)
-+
-+def __htons(x): return __bswap16(x)
-+
-+def __ntohl(x): return __bswap32(x)
-+
-+def __ntohs(x): return __bswap16(x)
-+
-+IPPROTO_IP = 0
-+IPPROTO_ICMP = 1
-+IPPROTO_TCP = 6
-+IPPROTO_UDP = 17
-+def htonl(x): return __htonl(x)
-+
-+def htons(x): return __htons(x)
-+
-+def ntohl(x): return __ntohl(x)
-+
-+def ntohs(x): return __ntohs(x)
-+
-+IPPROTO_RAW = 255
-+INET_ADDRSTRLEN = 16
-+IPPROTO_HOPOPTS = 0
-+IPPROTO_IGMP = 2
-+IPPROTO_GGP = 3
-+IPPROTO_IPV4 = 4
-+IPPROTO_IPIP = IPPROTO_IPV4
-+IPPROTO_ST = 7
-+IPPROTO_EGP = 8
-+IPPROTO_PIGP = 9
-+IPPROTO_RCCMON = 10
-+IPPROTO_NVPII = 11
-+IPPROTO_PUP = 12
-+IPPROTO_ARGUS = 13
-+IPPROTO_EMCON = 14
-+IPPROTO_XNET = 15
-+IPPROTO_CHAOS = 16
-+IPPROTO_MUX = 18
-+IPPROTO_MEAS = 19
-+IPPROTO_HMP = 20
-+IPPROTO_PRM = 21
-+IPPROTO_IDP = 22
-+IPPROTO_TRUNK1 = 23
-+IPPROTO_TRUNK2 = 24
-+IPPROTO_LEAF1 = 25
-+IPPROTO_LEAF2 = 26
-+IPPROTO_RDP = 27
-+IPPROTO_IRTP = 28
-+IPPROTO_TP = 29
-+IPPROTO_BLT = 30
-+IPPROTO_NSP = 31
-+IPPROTO_INP = 32
-+IPPROTO_SEP = 33
-+IPPROTO_3PC = 34
-+IPPROTO_IDPR = 35
-+IPPROTO_XTP = 36
-+IPPROTO_DDP = 37
-+IPPROTO_CMTP = 38
-+IPPROTO_TPXX = 39
-+IPPROTO_IL = 40
-+IPPROTO_IPV6 = 41
-+IPPROTO_SDRP = 42
-+IPPROTO_ROUTING = 43
-+IPPROTO_FRAGMENT = 44
-+IPPROTO_IDRP = 45
-+IPPROTO_RSVP = 46
-+IPPROTO_GRE = 47
-+IPPROTO_MHRP = 48
-+IPPROTO_BHA = 49
-+IPPROTO_ESP = 50
-+IPPROTO_AH = 51
-+IPPROTO_INLSP = 52
-+IPPROTO_SWIPE = 53
-+IPPROTO_NHRP = 54
-+IPPROTO_MOBILE = 55
-+IPPROTO_TLSP = 56
-+IPPROTO_SKIP = 57
-+IPPROTO_ICMPV6 = 58
-+IPPROTO_NONE = 59
-+IPPROTO_DSTOPTS = 60
-+IPPROTO_AHIP = 61
-+IPPROTO_CFTP = 62
-+IPPROTO_HELLO = 63
-+IPPROTO_SATEXPAK = 64
-+IPPROTO_KRYPTOLAN = 65
-+IPPROTO_RVD = 66
-+IPPROTO_IPPC = 67
-+IPPROTO_ADFS = 68
-+IPPROTO_SATMON = 69
-+IPPROTO_VISA = 70
-+IPPROTO_IPCV = 71
-+IPPROTO_CPNX = 72
-+IPPROTO_CPHB = 73
-+IPPROTO_WSN = 74
-+IPPROTO_PVP = 75
-+IPPROTO_BRSATMON = 76
-+IPPROTO_ND = 77
-+IPPROTO_WBMON = 78
-+IPPROTO_WBEXPAK = 79
-+IPPROTO_EON = 80
-+IPPROTO_VMTP = 81
-+IPPROTO_SVMTP = 82
-+IPPROTO_VINES = 83
-+IPPROTO_TTP = 84
-+IPPROTO_IGP = 85
-+IPPROTO_DGP = 86
-+IPPROTO_TCF = 87
-+IPPROTO_IGRP = 88
-+IPPROTO_OSPFIGP = 89
-+IPPROTO_SRPC = 90
-+IPPROTO_LARP = 91
-+IPPROTO_MTP = 92
-+IPPROTO_AX25 = 93
-+IPPROTO_IPEIP = 94
-+IPPROTO_MICP = 95
-+IPPROTO_SCCSP = 96
-+IPPROTO_ETHERIP = 97
-+IPPROTO_ENCAP = 98
-+IPPROTO_APES = 99
-+IPPROTO_GMTP = 100
-+IPPROTO_IPCOMP = 108
-+IPPROTO_PIM = 103
-+IPPROTO_PGM = 113
-+IPPROTO_PFSYNC = 240
-+IPPROTO_OLD_DIVERT = 254
-+IPPROTO_MAX = 256
-+IPPROTO_DONE = 257
-+IPPROTO_DIVERT = 258
-+IPPORT_RESERVED = 1024
-+IPPORT_HIFIRSTAUTO = 49152
-+IPPORT_HILASTAUTO = 65535
-+IPPORT_RESERVEDSTART = 600
-+IPPORT_MAX = 65535
-+def IN_CLASSA(i): return (((u_int32_t)(i) & (-2147483648)) == 0)
-+
-+IN_CLASSA_NET = (-16777216)
-+IN_CLASSA_NSHIFT = 24
-+IN_CLASSA_HOST = 0x00ffffff
-+IN_CLASSA_MAX = 128
-+def IN_CLASSB(i): return (((u_int32_t)(i) & (-1073741824)) == (-2147483648))
-+
-+IN_CLASSB_NET = (-65536)
-+IN_CLASSB_NSHIFT = 16
-+IN_CLASSB_HOST = 0x0000ffff
-+IN_CLASSB_MAX = 65536
-+def IN_CLASSC(i): return (((u_int32_t)(i) & (-536870912)) == (-1073741824))
-+
-+IN_CLASSC_NET = (-256)
-+IN_CLASSC_NSHIFT = 8
-+IN_CLASSC_HOST = 0x000000ff
-+def IN_CLASSD(i): return (((u_int32_t)(i) & (-268435456)) == (-536870912))
-+
-+IN_CLASSD_NET = (-268435456)
-+IN_CLASSD_NSHIFT = 28
-+IN_CLASSD_HOST = 0x0fffffff
-+def IN_MULTICAST(i): return IN_CLASSD(i)
-+
-+def IN_EXPERIMENTAL(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+def IN_BADCLASS(i): return (((u_int32_t)(i) & (-268435456)) == (-268435456))
-+
-+INADDR_NONE = (-1)
-+IN_LOOPBACKNET = 127
-+IP_OPTIONS = 1
-+IP_HDRINCL = 2
-+IP_TOS = 3
-+IP_TTL = 4
-+IP_RECVOPTS = 5
-+IP_RECVRETOPTS = 6
-+IP_RECVDSTADDR = 7
-+IP_SENDSRCADDR = IP_RECVDSTADDR
-+IP_RETOPTS = 8
-+IP_MULTICAST_IF = 9
-+IP_MULTICAST_TTL = 10
-+IP_MULTICAST_LOOP = 11
-+IP_ADD_MEMBERSHIP = 12
-+IP_DROP_MEMBERSHIP = 13
-+IP_MULTICAST_VIF = 14
-+IP_RSVP_ON = 15
-+IP_RSVP_OFF = 16
-+IP_RSVP_VIF_ON = 17
-+IP_RSVP_VIF_OFF = 18
-+IP_PORTRANGE = 19
-+IP_RECVIF = 20
-+IP_IPSEC_POLICY = 21
-+IP_FAITH = 22
-+IP_ONESBCAST = 23
-+IP_FW_TABLE_ADD = 40
-+IP_FW_TABLE_DEL = 41
-+IP_FW_TABLE_FLUSH = 42
-+IP_FW_TABLE_GETSIZE = 43
-+IP_FW_TABLE_LIST = 44
-+IP_FW_ADD = 50
-+IP_FW_DEL = 51
-+IP_FW_FLUSH = 52
-+IP_FW_ZERO = 53
-+IP_FW_GET = 54
-+IP_FW_RESETLOG = 55
-+IP_DUMMYNET_CONFIGURE = 60
-+IP_DUMMYNET_DEL = 61
-+IP_DUMMYNET_FLUSH = 62
-+IP_DUMMYNET_GET = 64
-+IP_RECVTTL = 65
-+IP_DEFAULT_MULTICAST_TTL = 1
-+IP_DEFAULT_MULTICAST_LOOP = 1
-+IP_MAX_MEMBERSHIPS = 20
-+IP_PORTRANGE_DEFAULT = 0
-+IP_PORTRANGE_HIGH = 1
-+IP_PORTRANGE_LOW = 2
-+IPPROTO_MAXID = (IPPROTO_AH + 1)
-+IPCTL_FORWARDING = 1
-+IPCTL_SENDREDIRECTS = 2
-+IPCTL_DEFTTL = 3
-+IPCTL_DEFMTU = 4
-+IPCTL_RTEXPIRE = 5
-+IPCTL_RTMINEXPIRE = 6
-+IPCTL_RTMAXCACHE = 7
-+IPCTL_SOURCEROUTE = 8
-+IPCTL_DIRECTEDBROADCAST = 9
-+IPCTL_INTRQMAXLEN = 10
-+IPCTL_INTRQDROPS = 11
-+IPCTL_STATS = 12
-+IPCTL_ACCEPTSOURCEROUTE = 13
-+IPCTL_FASTFORWARDING = 14
-+IPCTL_KEEPFAITH = 15
-+IPCTL_GIF_TTL = 16
-+IPCTL_MAXID = 17
-+def in_nullhost(x): return ((x).s_addr == INADDR_ANY)
-+
-+
-+# Included from netinet6/in6.h
-+__KAME_VERSION = "20010528/FreeBSD"
-+IPV6PORT_RESERVED = 1024
-+IPV6PORT_ANONMIN = 49152
-+IPV6PORT_ANONMAX = 65535
-+IPV6PORT_RESERVEDMIN = 600
-+IPV6PORT_RESERVEDMAX = (IPV6PORT_RESERVED-1)
-+INET6_ADDRSTRLEN = 46
-+IPV6_ADDR_INT32_ONE = 1
-+IPV6_ADDR_INT32_TWO = 2
-+IPV6_ADDR_INT32_MNL = (-16711680)
-+IPV6_ADDR_INT32_MLL = (-16646144)
-+IPV6_ADDR_INT32_SMP = 0x0000ffff
-+IPV6_ADDR_INT16_ULL = 0xfe80
-+IPV6_ADDR_INT16_USL = 0xfec0
-+IPV6_ADDR_INT16_MLL = 0xff02
-+IPV6_ADDR_INT32_ONE = 0x01000000
-+IPV6_ADDR_INT32_TWO = 0x02000000
-+IPV6_ADDR_INT32_MNL = 0x000001ff
-+IPV6_ADDR_INT32_MLL = 0x000002ff
-+IPV6_ADDR_INT32_SMP = (-65536)
-+IPV6_ADDR_INT16_ULL = 0x80fe
-+IPV6_ADDR_INT16_USL = 0xc0fe
-+IPV6_ADDR_INT16_MLL = 0x02ff
-+def IN6_IS_ADDR_UNSPECIFIED(a): return \
-+
-+def IN6_IS_ADDR_LOOPBACK(a): return \
-+
-+def IN6_IS_ADDR_V4COMPAT(a): return \
-+
-+def IN6_IS_ADDR_V4MAPPED(a): return \
-+
-+IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+__IPV6_ADDR_SCOPE_NODELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_INTFACELOCAL = 0x01
-+__IPV6_ADDR_SCOPE_LINKLOCAL = 0x02
-+__IPV6_ADDR_SCOPE_SITELOCAL = 0x05
-+__IPV6_ADDR_SCOPE_ORGLOCAL = 0x08
-+__IPV6_ADDR_SCOPE_GLOBAL = 0x0e
-+def IN6_IS_ADDR_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_INTFACELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_ADDR_MC_NODELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_LINKLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_SITELOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_ORGLOCAL(a): return \
-+
-+def IN6_IS_ADDR_MC_GLOBAL(a): return \
-+
-+def IN6_IS_SCOPE_LINKLOCAL(a): return \
-+
-+def IFA6_IS_DEPRECATED(a): return \
-+
-+def IFA6_IS_INVALID(a): return \
-+
-+IPV6_OPTIONS = 1
-+IPV6_RECVOPTS = 5
-+IPV6_RECVRETOPTS = 6
-+IPV6_RECVDSTADDR = 7
-+IPV6_RETOPTS = 8
-+IPV6_SOCKOPT_RESERVED1 = 3
-+IPV6_UNICAST_HOPS = 4
-+IPV6_MULTICAST_IF = 9
-+IPV6_MULTICAST_HOPS = 10
-+IPV6_MULTICAST_LOOP = 11
-+IPV6_JOIN_GROUP = 12
-+IPV6_LEAVE_GROUP = 13
-+IPV6_PORTRANGE = 14
-+ICMP6_FILTER = 18
-+IPV6_2292PKTINFO = 19
-+IPV6_2292HOPLIMIT = 20
-+IPV6_2292NEXTHOP = 21
-+IPV6_2292HOPOPTS = 22
-+IPV6_2292DSTOPTS = 23
-+IPV6_2292RTHDR = 24
-+IPV6_2292PKTOPTIONS = 25
-+IPV6_CHECKSUM = 26
-+IPV6_V6ONLY = 27
-+IPV6_BINDV6ONLY = IPV6_V6ONLY
-+IPV6_IPSEC_POLICY = 28
-+IPV6_FAITH = 29
-+IPV6_FW_ADD = 30
-+IPV6_FW_DEL = 31
-+IPV6_FW_FLUSH = 32
-+IPV6_FW_ZERO = 33
-+IPV6_FW_GET = 34
-+IPV6_RTHDRDSTOPTS = 35
-+IPV6_RECVPKTINFO = 36
-+IPV6_RECVHOPLIMIT = 37
-+IPV6_RECVRTHDR = 38
-+IPV6_RECVHOPOPTS = 39
-+IPV6_RECVDSTOPTS = 40
-+IPV6_RECVRTHDRDSTOPTS = 41
-+IPV6_USE_MIN_MTU = 42
-+IPV6_RECVPATHMTU = 43
-+IPV6_PATHMTU = 44
-+IPV6_REACHCONF = 45
-+IPV6_PKTINFO = 46
-+IPV6_HOPLIMIT = 47
-+IPV6_NEXTHOP = 48
-+IPV6_HOPOPTS = 49
-+IPV6_DSTOPTS = 50
-+IPV6_RTHDR = 51
-+IPV6_PKTOPTIONS = 52
-+IPV6_RECVTCLASS = 57
-+IPV6_AUTOFLOWLABEL = 59
-+IPV6_TCLASS = 61
-+IPV6_DONTFRAG = 62
-+IPV6_PREFER_TEMPADDR = 63
-+IPV6_RTHDR_LOOSE = 0
-+IPV6_RTHDR_STRICT = 1
-+IPV6_RTHDR_TYPE_0 = 0
-+IPV6_DEFAULT_MULTICAST_HOPS = 1
-+IPV6_DEFAULT_MULTICAST_LOOP = 1
-+IPV6_PORTRANGE_DEFAULT = 0
-+IPV6_PORTRANGE_HIGH = 1
-+IPV6_PORTRANGE_LOW = 2
-+IPV6PROTO_MAXID = (IPPROTO_PIM + 1)
-+IPV6CTL_FORWARDING = 1
-+IPV6CTL_SENDREDIRECTS = 2
-+IPV6CTL_DEFHLIM = 3
-+IPV6CTL_DEFMTU = 4
-+IPV6CTL_FORWSRCRT = 5
-+IPV6CTL_STATS = 6
-+IPV6CTL_MRTSTATS = 7
-+IPV6CTL_MRTPROTO = 8
-+IPV6CTL_MAXFRAGPACKETS = 9
-+IPV6CTL_SOURCECHECK = 10
-+IPV6CTL_SOURCECHECK_LOGINT = 11
-+IPV6CTL_ACCEPT_RTADV = 12
-+IPV6CTL_KEEPFAITH = 13
-+IPV6CTL_LOG_INTERVAL = 14
-+IPV6CTL_HDRNESTLIMIT = 15
-+IPV6CTL_DAD_COUNT = 16
-+IPV6CTL_AUTO_FLOWLABEL = 17
-+IPV6CTL_DEFMCASTHLIM = 18
-+IPV6CTL_GIF_HLIM = 19
-+IPV6CTL_KAME_VERSION = 20
-+IPV6CTL_USE_DEPRECATED = 21
-+IPV6CTL_RR_PRUNE = 22
-+IPV6CTL_MAPPED_ADDR = 23
-+IPV6CTL_V6ONLY = 24
-+IPV6CTL_RTEXPIRE = 25
-+IPV6CTL_RTMINEXPIRE = 26
-+IPV6CTL_RTMAXCACHE = 27
-+IPV6CTL_USETEMPADDR = 32
-+IPV6CTL_TEMPPLTIME = 33
-+IPV6CTL_TEMPVLTIME = 34
-+IPV6CTL_AUTO_LINKLOCAL = 35
-+IPV6CTL_RIP6STATS = 36
-+IPV6CTL_PREFER_TEMPADDR = 37
-+IPV6CTL_ADDRCTLPOLICY = 38
-+IPV6CTL_MAXFRAGS = 41
-+IPV6CTL_MAXID = 42
diff --git a/lang/python24/files/patch-Lib::posixfile.py b/lang/python24/files/patch-Lib::posixfile.py
deleted file mode 100644
index 59ce175a895d..000000000000
--- a/lang/python24/files/patch-Lib::posixfile.py
+++ /dev/null
@@ -1,16 +0,0 @@
-===================================================================
-RCS file: /cvsroot/python/python/dist/src/Lib/posixfile.py,v
-retrieving revision 1.25
-retrieving revision 1.26
-diff -u -r1.25 -r1.26
---- Lib/posixfile.py	2004/02/12 17:35:06	1.25
-+++ Lib/posixfile.py	2004/08/18 15:13:40	1.26
-@@ -185,7 +185,7 @@
-         if sys.platform in ('netbsd1',
-                             'openbsd2',
-                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
--                            'bsdos2', 'bsdos3', 'bsdos4'):
-+                            'freebsd6', 'bsdos2', 'bsdos3', 'bsdos4'):
-             flock = struct.pack('lxxxxlxxxxlhh', \
-                   l_start, l_len, os.getpid(), l_type, l_whence)
-         elif sys.platform in ['aix3', 'aix4']:
diff --git a/lang/python24/files/patch-Makefile.pre.in b/lang/python24/files/patch-Makefile.pre.in
deleted file mode 100644
index 8ab09bec3ba2..000000000000
--- a/lang/python24/files/patch-Makefile.pre.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.pre.in.orig	Sat Nov 15 21:37:25 2003
-+++ Makefile.pre.in	Sat Nov 15 21:37:54 2003
-@@ -710,11 +710,11 @@
- 		./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST)
--	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
--	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
diff --git a/lang/python24/files/patch-Python::ceval.c b/lang/python24/files/patch-Python::ceval.c
index fc42c6e58d51..057d4b6a066e 100644
--- a/lang/python24/files/patch-Python::ceval.c
+++ b/lang/python24/files/patch-Python::ceval.c
@@ -1,14 +1,16 @@
---- Python/ceval.c.orig	Sat Dec 20 15:13:53 2003
-+++ Python/ceval.c	Sat Dec 20 15:15:46 2003
-@@ -496,7 +496,10 @@
+--- Python/ceval.c.orig	Wed Nov 24 03:06:08 2004
++++ Python/ceval.c	Wed Dec  1 22:29:37 2004
+@@ -414,8 +414,11 @@
  
  /* The interpreter's recursion limit */
  
 -static int recursion_limit = 1000;
+-int _Py_CheckRecursionLimit = 1000;
 +#ifndef PYTHON_DEFAULT_RECURSION_LIMIT
 +#define PYTHON_DEFAULT_RECURSION_LIMIT 1000
 +#endif
 +static int recursion_limit = PYTHON_DEFAULT_RECURSION_LIMIT;
++int _Py_CheckRecursionLimit = PYTHON_DEFAULT_RECURSION_LIMIT;
  
  int
  Py_GetRecursionLimit(void)
diff --git a/lang/python24/files/patch-configure b/lang/python24/files/patch-configure
deleted file mode 100644
index fe9629450d08..000000000000
--- a/lang/python24/files/patch-configure
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	Sat May  8 04:13:40 2004
-+++ configure	Fri Jun  4 14:15:59 2004
-@@ -1321,7 +1321,7 @@
- VERSION=2.3
- 
- 
--SOVERSION=1.0
-+SOVERSION=1
- 
- # The later defininition of _XOPEN_SOURCE disables certain features
- # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -3609,6 +3609,12 @@
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  ;;
-+    FreeBSD*)
-+	  LDLIBRARY='libpython$(VERSION).so'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY".$SOVERSION
-+	  ;;
-     hp*|HP*)
- 	  LDLIBRARY='libpython$(VERSION).sl'
- 	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -10100,7 +10106,7 @@
- 	OpenBSD*|FreeBSD*)
- 		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
- 		then
--			LDSHARED="cc -shared ${LDFLAGS}"
-+			LDSHARED="$CC -shared ${LDFLAGS}"
- 		else
- 			LDSHARED="ld -Bshareable ${LDFLAGS}"
- 		fi;;
-@@ -12273,7 +12279,7 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_pthread_system_supported=yes
-+  ac_cv_pthread_system_supported="ignored by port"
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py
index 42d6b9a68984..7a4e76912d96 100644
--- a/lang/python24/files/patch-setup.py
+++ b/lang/python24/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Sat Aug 21 08:12:35 2004
-+++ setup.py	Sat Aug 21 08:12:48 2004
+--- setup.py.orig      Tue Aug 31 10:37:25 2004
++++ setup.py   Fri Sep  3 10:42:53 2004
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -9,12 +9,3 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -770,7 +770,7 @@
-             # Linux-specific modules
-             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
- 
--        if platform in ('linux2', 'freebsd4'):
-+        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
-             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
- 
-         if platform == 'sunos5':
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