diff options
| author | Georg Brandl <georg@python.org> | 2009-09-16 16:09:06 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-09-16 16:09:06 (GMT) |
| commit | 70177e9b15f6c7edcacdc690ce8a4aa49586fb4e (patch) | |
| tree | 39dd1ca9155aa4e3b5b085369c2d46ba0f951383 | |
| parent | b044b2a701179dc6f8d50d28c7d4486e0d0d7a09 (diff) | |
| download | cpython-70177e9b15f6c7edcacdc690ce8a4aa49586fb4e.zip cpython-70177e9b15f6c7edcacdc690ce8a4aa49586fb4e.tar.gz cpython-70177e9b15f6c7edcacdc690ce8a4aa49586fb4e.tar.bz2 | |
Merged revisions 74792,74810 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74792 | georg.brandl | 2009-09-14 16:49:30 +0200 (Mo, 14 Sep 2009) | 9 lines
Recorded merge of revisions 74791 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74791 | georg.brandl | 2009-09-14 16:08:54 +0200 (Mo, 14 Sep 2009) | 1 line
#6574: list the future features in a table.
........
................
r74810 | georg.brandl | 2009-09-15 21:55:15 +0200 (Di, 15 Sep 2009) | 1 line
Do not document the most important (at least for Guido) future import.
................
| -rw-r--r-- | Doc/library/__future__.rst | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst index 29f3109..3c42393 100644 --- a/Doc/library/__future__.rst +++ b/Doc/library/__future__.rst @@ -10,9 +10,9 @@ * To avoid confusing existing tools that analyze import statements and expect to find the modules they're importing. -* To ensure that future_statements run under releases prior to 2.1 at least - yield runtime exceptions (the import of :mod:`__future__` will fail, because - there was no module of that name prior to 2.1). +* To ensure that :ref:`future statements <future>` run under releases prior to + 2.1 at least yield runtime exceptions (the import of :mod:`__future__` will + fail, because there was no module of that name prior to 2.1). * To document when incompatible changes were introduced, and when they will be --- or were --- made mandatory. This is a form of executable documentation, and @@ -56,7 +56,35 @@ argument to the built-in function :func:`compile` to enable the feature in dynamically compiled code. This flag is stored in the :attr:`compiler_flag` attribute on :class:`_Feature` instances. -No feature description will ever be deleted from :mod:`__future__`. +No feature description will ever be deleted from :mod:`__future__`. Since its +introduction in Python 2.1 the following features have found their way into the +language using this mechanism: + ++------------------+-------------+--------------+---------------------------------------------+ +| feature | optional in | mandatory in | effect | ++==================+=============+==============+=============================================+ +| nested_scopes | 2.1.0b1 | 2.2 | :pep:`227`: | +| | | | *Statically Nested Scopes* | ++------------------+-------------+--------------+---------------------------------------------+ +| generators | 2.2.0a1 | 2.3 | :pep:`255`: | +| | | | *Simple Generators* | ++------------------+-------------+--------------+---------------------------------------------+ +| division | 2.2.0a2 | 3.0 | :pep:`238`: | +| | | | *Changing the Division Operator* | ++------------------+-------------+--------------+---------------------------------------------+ +| absolute_import | 2.5.0a1 | 2.7 | :pep:`328`: | +| | | | *Imports: Multi-Line and Absolute/Relative* | ++------------------+-------------+--------------+---------------------------------------------+ +| with_statement | 2.5.0a1 | 2.6 | :pep:`343`: | +| | | | *The "with" Statement* | ++------------------+-------------+--------------+---------------------------------------------+ +| print_function | 2.6.0a2 | 3.0 | :pep:`3105`: | +| | | | *Make print a function* | ++------------------+-------------+--------------+---------------------------------------------+ +| unicode_literals | 2.6.0a2 | 3.0 | :pep:`3112`: | +| | | | *Bytes literals in Python 3000* | ++------------------+-------------+--------------+---------------------------------------------+ + .. seealso:: |