summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-09-27 18:59:36 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-09-27 18:59:36 (GMT)
commit1f3a88fe55d7bbb30db372c5c4e7fedd05daac8a (patch)
treec011a10d666fc7c31ee44f578af86acb4ebc393c
parentca534ab4957f3ed081133f2174543d8a560a4051 (diff)
downloadcpython-1f3a88fe55d7bbb30db372c5c4e7fedd05daac8a.zip
cpython-1f3a88fe55d7bbb30db372c5c4e7fedd05daac8a.tar.gz
cpython-1f3a88fe55d7bbb30db372c5c4e7fedd05daac8a.tar.bz2
#20974: Update version table in email intro.
Note that the email version string in 3.3 and 3.4 is inaccurate, since it still exists but wasn't updated while the code was.
-rw-r--r--Doc/library/email.rst10
1 files changed, 7 insertions, 3 deletions
diff --git a/Doc/library/email.rst b/Doc/library/email.rst
index 331d2ef..e9c62f2 100644
--- a/Doc/library/email.rst
+++ b/Doc/library/email.rst
@@ -91,15 +91,19 @@ table also describes the Python compatibility of each version of the package.
+---------------+------------------------------+-----------------------+
| :const:`2.5` | Python 2.2.2+ and Python 2.3 | Python 2.1 to 2.5 |
+---------------+------------------------------+-----------------------+
-| :const:`3.0` | Python 2.4 | Python 2.3 to 2.5 |
+| :const:`3.0` | Python 2.4 and Python 2.5 | Python 2.3 to 2.6 |
+---------------+------------------------------+-----------------------+
-| :const:`4.0` | Python 2.5 | Python 2.3 to 2.5 |
+| :const:`4.0` | Python 2.5 to Python 2.7 | Python 2.3 to 2.7 |
+---------------+------------------------------+-----------------------+
| :const:`5.0` | Python 3.0 and Python 3.1 | Python 3.0 to 3.2 |
+---------------+------------------------------+-----------------------+
-| :const:`5.1` | Python 3.2 | Python 3.0 to 3.2 |
+| :const:`5.1` | Python 3.2 | Python 3.2 |
+---------------+------------------------------+-----------------------+
+After Version 5.1 (Python 3.2), the email package no longer has a version that
+is separate from the Python version. (See the :ref:`whatsnew-index` documents
+for the respective Python versions for details on changes.)
+
Here are the major differences between :mod:`email` version 5.1 and
version 5.0: