summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-02 20:32:03 (GMT)
committerGeorg Brandl <georg@python.org>2010-08-02 20:32:03 (GMT)
commit1858b6f2dcb960687128d5d408d2b6aad63dbac7 (patch)
tree124765b02a543082a408342c129b7ea030c96343
parent3edccce7efa450e9a439e99b32f8981b123e3c49 (diff)
downloadcpython-1858b6f2dcb960687128d5d408d2b6aad63dbac7.zip
cpython-1858b6f2dcb960687128d5d408d2b6aad63dbac7.tar.gz
cpython-1858b6f2dcb960687128d5d408d2b6aad63dbac7.tar.bz2
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. ........
-rw-r--r--Doc/library/constants.rst14
1 files changed, 10 insertions, 4 deletions
diff --git a/Doc/library/constants.rst b/Doc/library/constants.rst
index b02e04e..80e792c 100644
--- a/Doc/library/constants.rst
+++ b/Doc/library/constants.rst
@@ -3,7 +3,6 @@ Built-in Constants
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 @@ A small number of constants live in the built-in namespace. They are:
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
-----------------------------------------