[Python-checkins] cpython (2.7): Issue13820 as and with really became keywords in 2.6.

[terry.reedy]

http://hg.python.org/cpython/rev/c84b39c18963
changeset:   74550:c84b39c18963
branch:      2.7
parent:      74547:4366c0df2c73
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Jan 21 00:24:25 2012 -0500
summary:
  Issue13820 as and with really became keywords in 2.6.
Original rewording by Jim Jewett

files:
  Doc/reference/lexical_analysis.rst |  11 +++++------
  1 files changed, 5 insertions(+), 6 deletions(-)


diff --git a/Doc/reference/lexical_analysis.rst b/Doc/reference/lexical_analysis.rst
--- a/Doc/reference/lexical_analysis.rst
+++ b/Doc/reference/lexical_analysis.rst
@@ -357,12 +357,11 @@
    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:
 

-- 
Repository URL: http://hg.python.org/cpython