summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-17 17:32:02 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-17 17:32:02 (GMT)
commit03c6110b21dc93b23f054f7674e9c2529fd44356 (patch)
tree29098b763e177a0762555e4ec2dbeec07fa1f96b
parent3b6a31412f881c7ef968058e200e0907b6fbde1b (diff)
downloadcpython-03c6110b21dc93b23f054f7674e9c2529fd44356.zip
cpython-03c6110b21dc93b23f054f7674e9c2529fd44356.tar.gz
cpython-03c6110b21dc93b23f054f7674e9c2529fd44356.tar.bz2
revert part of cefe4f38fa0e, as agreed with Éric
-rw-r--r--Doc/glossary.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 37fa9b0..36a912c 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -519,11 +519,10 @@ Glossary
nested scope
The ability to refer to a variable in an enclosing definition. For
instance, a function defined inside another function can refer to
- variables in the outer function. Note that nested scopes by default work
- only for reference and not for assignment. Local variables both read and
- write in the innermost scope. Likewise, global variables read and write
- to the global namespace. The :keyword:`nonlocal` allows writing to outer
- scopes.
+ variables in the outer function. Note that nested scopes work only for
+ reference and not for assignment which will always write to the innermost
+ scope. In contrast, local variables both read and write in the innermost
+ scope. Likewise, global variables read and write to the global namespace.
new-style class
Any class which inherits from :class:`object`. This includes all built-in