summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-10-09 20:54:43 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-10-09 20:54:43 (GMT)
commitf660a53c9f53e91cb8dbd794c0fdb6e4dc36c7bc (patch)
tree2a895db58c1bc12bd8ed4565750dcd85f192c7be /Doc/reference
parent6c75a30712cb5f00d77582edddc24d0a9850d0a0 (diff)
downloadcpython-f660a53c9f53e91cb8dbd794c0fdb6e4dc36c7bc.zip
cpython-f660a53c9f53e91cb8dbd794c0fdb6e4dc36c7bc.tar.gz
cpython-f660a53c9f53e91cb8dbd794c0fdb6e4dc36c7bc.tar.bz2
update paragraph about __future__ for 2.6
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/simple_stmts.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index f8df013..183b776 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -788,10 +788,11 @@ can appear before a future statement are:
* blank lines, and
* other future statements.
-The features recognized by Python 2.5 are ``absolute_import``, ``division``,
-``generators``, ``nested_scopes`` and ``with_statement``. ``generators`` and
-``nested_scopes`` are redundant in Python version 2.3 and above because they
-are always enabled.
+The features recognized by Python 2.6 are ``unicode_literals``,
+``print_function``, ``absolute_import``, ``division``, ``generators``,
+``nested_scopes`` and ``with_statement``. ``generators``, ``with_statement``,
+``nested_scopes`` are redundant in Python version 2.6 and above because they are
+always enabled.
A future statement is recognized and treated specially at compile time: Changes
to the semantics of core constructs are often implemented by generating