summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2012-01-21 05:24:25 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2012-01-21 05:24:25 (GMT)
commit96a0a46353622d536561b7259eba2d02cf0db966 (patch)
treeef1d80ac63437260bf3985d7f08b85142a61a780 /Doc/reference
parentb05f91d1555265223f1a2b5a262f035bb2d01fd6 (diff)
downloadcpython-96a0a46353622d536561b7259eba2d02cf0db966.zip
cpython-96a0a46353622d536561b7259eba2d02cf0db966.tar.gz
cpython-96a0a46353622d536561b7259eba2d02cf0db966.tar.bz2
Issue13820 as and with really became keywords in 2.6.
Original rewording by Jim Jewett
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/lexical_analysis.rst11
1 files changed, 5 insertions, 6 deletions
diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
index d716139..62ec664 100644
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -357,12 +357,11 @@ exactly as written here:
assign a different object to it.
.. versionchanged:: 2.5
- Both :keyword:`as` and :keyword:`with` are only recognized when the
- ``with_statement`` future feature has been enabled. It will always be enabled in
- Python 2.6. See section :ref:`with` for details. Note that using :keyword:`as`
- and :keyword:`with` as identifiers will always issue a warning, even when the
- ``with_statement`` future directive is not in effect.
-
+ Using :keyword:`as` and :keyword:`with` as identifiers triggers a warning. To
+ use them as keywords, enable the ``with_statement`` future feature .
+
+.. versionchanged:: 2.6
+ :keyword:`as` and :keyword:`with` are full keywords.
.. _id-classes: