aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.python.mk10
-rw-r--r--lang/python-devel/Makefile3
-rw-r--r--lang/python-devel/distinfo2
-rw-r--r--lang/python-devel/pkg-plist61
-rw-r--r--lang/python/Makefile3
-rw-r--r--lang/python/distinfo2
-rw-r--r--lang/python/pkg-plist61
-rw-r--r--lang/python22/Makefile3
-rw-r--r--lang/python22/distinfo2
-rw-r--r--lang/python22/pkg-plist61
-rw-r--r--lang/python23/Makefile3
-rw-r--r--lang/python23/distinfo2
-rw-r--r--lang/python23/pkg-plist61
-rw-r--r--lang/python24/Makefile3
-rw-r--r--lang/python24/distinfo2
-rw-r--r--lang/python24/pkg-plist61
-rw-r--r--lang/python25/Makefile3
-rw-r--r--lang/python25/distinfo2
-rw-r--r--lang/python25/pkg-plist61
-rw-r--r--lang/python26/Makefile3
-rw-r--r--lang/python26/distinfo2
-rw-r--r--lang/python26/pkg-plist61
-rw-r--r--lang/python27/Makefile3
-rw-r--r--lang/python27/distinfo2
-rw-r--r--lang/python27/pkg-plist61
-rw-r--r--lang/python30/Makefile3
-rw-r--r--lang/python30/distinfo2
-rw-r--r--lang/python30/pkg-plist61
-rw-r--r--lang/python31/Makefile3
-rw-r--r--lang/python31/distinfo2
-rw-r--r--lang/python31/pkg-plist61
-rw-r--r--lang/python32/Makefile3
-rw-r--r--lang/python32/distinfo2
-rw-r--r--lang/python32/pkg-plist61
34 files changed, 687 insertions, 49 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 762001826f8e..50b65ef05b49 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -111,13 +111,13 @@ _PYTHON_VERSION!= (python -c 'import sys; print sys.version[:3]') 2> /dev/null \
|| echo 2.2
.endif
PYTHON_VERSION?= python${_PYTHON_VERSION}
-_PYTHON_PORTVERSION= 2.2.2
-PYTHON_PORTVERSION!= (${PYTHON_VERSION} -c 'import string, sys; \
+_PYTHON_PORTVERSION= 2.2.3
+PYTHON_CMD?= ${PYTHONBASE}/bin/${PYTHON_VERSION}
+PYTHON_PORTVERSION!= (${PYTHON_CMD} -c 'import string, sys; \
print string.split(sys.version)[0]') 2> /dev/null \
|| echo ${_PYTHON_PORTVERSION}
-PYTHONBASE!= (${PYTHON_VERSION} -c 'import sys; print sys.prefix') \
+PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print sys.prefix') \
2> /dev/null || echo ${LOCALBASE}
-PYTHON_CMD?= ${PYTHONBASE}/bin/${PYTHON_VERSION}
# Python-2.2
.if ${PYTHON_VERSION} == "python2.2"
@@ -127,7 +127,7 @@ PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
PYTHON_DISTFILE= Python-${_PYTHON_PORTVERSION}.tgz
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python
-PYTHON_REL= 222
+PYTHON_REL= 223
PYTHON_SUFFIX= 22
PYTHON_WRKSRC= ${WRKDIR}/Python-${_PYTHON_PORTVERSION}
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python/distinfo b/lang/python/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 0b0a336f65a1..c23acdb5c8b0 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index 34efdb2b946c..4af11d88bde8 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
+MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 6bc2eb2638ef..a9d86488e2d8 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -248,6 +248,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_as_sequence
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_call
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_compare
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_dealloc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_getattr
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_hash
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/modulator/Templates/object_tp_print
@@ -288,6 +289,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/copytime.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/crlf.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/cvsfiles.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.doc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/dutree.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/eptags.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/finddiv.py
@@ -318,6 +320,7 @@ lib/%%PYTHON_VERSION%%/TERMIOS.pyo
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py
+%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydoc
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/pydocgui.pyw
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py
%%PORTDOCS%%lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py
@@ -692,12 +695,64 @@ 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
lib/%%PYTHON_VERSION%%/email/base64MIME.py
lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
lib/%%PYTHON_VERSION%%/email/quopriMIME.py
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
+lib/%%PYTHON_VERSION%%/email/test/__init__.py
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyc
+lib/%%PYTHON_VERSION%%/email/test/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/test/data/PyBanner048.gif
+lib/%%PYTHON_VERSION%%/email/test/data/audiotest.au
+lib/%%PYTHON_VERSION%%/email/test/data/msg_01.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_02.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_03.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_04.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_05.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_06.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_07.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_08.txt
+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_13.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_14.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_15.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_16.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_17.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_18.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_19.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_20.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_21.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_22.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_23.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_24.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_25.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_26.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_27.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_28.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_29.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_30.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_31.txt
+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/test_email.py
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_codecs.pyo
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.py
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyc
+lib/%%PYTHON_VERSION%%/email/test/test_email_torture.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -857,6 +912,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.py
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyc
+lib/%%PYTHON_VERSION%%/encodings/koi8_u.pyo
lib/%%PYTHON_VERSION%%/encodings/latin_1.py
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyc
lib/%%PYTHON_VERSION%%/encodings/latin_1.pyo
@@ -1427,7 +1485,6 @@ lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
lib/%%PYTHON_VERSION%%/test/output/test_augassign
-lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
lib/%%PYTHON_VERSION%%/test/output/test_builtin
lib/%%PYTHON_VERSION%%/test/output/test_cfgparser
@@ -2617,6 +2674,8 @@ share/emacs/site-lisp/python-mode.el
@dirrm lib/%%PYTHON_VERSION%%/lib-dynload
@dirrm lib/%%PYTHON_VERSION%%/hotshot
@dirrm lib/%%PYTHON_VERSION%%/encodings
+@dirrm lib/%%PYTHON_VERSION%%/email/test/data
+@dirrm lib/%%PYTHON_VERSION%%/email/test
@dirrm lib/%%PYTHON_VERSION%%/email
@dirrm lib/%%PYTHON_VERSION%%/distutils/command
@dirrm lib/%%PYTHON_VERSION%%/distutils