[Python-checkins] r83596 - in python/branches/release26-maint: Doc/library/constants.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Aug  2 23:47:02 2010
New Revision: 83596

Log:
Merged revisions 83567 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83567 | georg.brandl | 2010-08-02 22:32:03 +0200 (Mo, 02 Aug 2010) | 9 lines
  
  Merged revisions 83552 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/branches/py3k
  
  ........
    r83552 | georg.brandl | 2010-08-02 21:36:36 +0200 (Mo, 02 Aug 2010) | 1 line
    
    #9438: clarify that constant names also cannot be assigned as attributes.
  ........
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/constants.rst

Modified: python/branches/release26-maint/Doc/library/constants.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/constants.rst	(original)
+++ python/branches/release26-maint/Doc/library/constants.rst	Mon Aug  2 23:47:02 2010
@@ -3,7 +3,6 @@
 
 A small number of constants live in the built-in namespace.  They are:
 
-
 .. data:: False
 
    The false value of the :class:`bool` type.
@@ -39,16 +38,23 @@
 
    Special value used in conjunction with extended slicing syntax.
 
-   .. XXX Someone who understands extended slicing should fill in here.
-
 
 .. data:: __debug__
 
    This constant is true if Python was not started with an :option:`-O` option.
-   Assignments to :const:`__debug__` are illegal and raise a :exc:`SyntaxError`.
    See also the :keyword:`assert` statement.
 
 
+.. note::
+
+   The names :data:`None` and :data:`__debug__` cannot be reassigned
+   (assignments to them, even as an attribute name, raise :exc:`SyntaxError`),
+   so they can be considered "true" constants.
+
+   .. versionchanged:: 2.7
+      Assignments to ``__debug__`` as an attribute became illegal.
+
+
 Constants added by the :mod:`site` module
 -----------------------------------------