Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
diff --git a/Doc/lib/mimelib.tex b/Doc/lib/mimelib.tex
index 67de597..491d844 100644
--- a/Doc/lib/mimelib.tex
+++ b/Doc/lib/mimelib.tex
@@ -12,9 +12,9 @@
\authoraddress{\email{barry@python.org}}
\date{\today}
-\release{3.0} % software release, not documentation
+\release{4.0} % software release, not documentation
\setreleaseinfo{} % empty for final release
-\setshortversion{3.0} % major.minor only for software
+\setshortversion{4.0} % major.minor only for software
\begin{document}
@@ -38,11 +38,11 @@
parse, generate, and modify email messages, conforming to all the
relevant email and MIME related RFCs.
-This document describes version 3.0 of the \module{email} package, which is
-distributed with Python 2.4 and is available as a standalone distutils-based
-package for use with Python 2.3. \module{email} 3.0 is not compatible with
-Python versions earlier than 2.3. For more information about the
-\module{email} package, including download links and mailing lists, see
+This document describes version 4.0 of the \module{email} package, which is
+distributed with Python 2.5 and is available as a standalone distutils-based
+package for use with earlier Python versions. \module{email} 4.0 is not
+compatible with Python versions earlier than 2.3. For more information about
+the \module{email} package, including download links and mailing lists, see
\ulink{Python's email SIG}{http://www.python.org/sigs/email-sig}.
The documentation that follows was written for the Python project, so
@@ -51,7 +51,8 @@
\begin{itemize}
\item Deprecation and ``version added'' notes are relative to the
- Python version a feature was added or deprecated.
+ Python version a feature was added or deprecated. See
+ the package history in section \ref{email-pkg-history} for details.
\item If you're reading this documentation as part of the
standalone \module{email} package, some of the internal links to