Merge: #20974: Update version table in email intro.

This commit is contained in:
R David Murray 2014-09-27 15:00:10 -04:00
commit 10177be421
1 changed files with 7 additions and 3 deletions

View File

@ -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:`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.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 Here are the major differences between :mod:`email` version 5.1 and
version 5.0: version 5.0: