summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-03-15 21:53:56 (GMT)
committerGeorg Brandl <georg@python.org>2009-03-15 21:53:56 (GMT)
commit173c1f1a01aaab413dce12a8e483da28c71343b8 (patch)
treedb09babe182bda2ff5d171a68fd729769cc5bab9 /Doc
parent09827eb55e4c5ceca5af2edd8bf7d129d4ecdf3c (diff)
downloadcpython-173c1f1a01aaab413dce12a8e483da28c71343b8.zip
cpython-173c1f1a01aaab413dce12a8e483da28c71343b8.tar.gz
cpython-173c1f1a01aaab413dce12a8e483da28c71343b8.tar.bz2
#5469: add with statement to list of name-binding constructs.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/executionmodel.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst
index 0d15657..05f8b92 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -87,9 +87,10 @@ subclass of :exc:`NameError`.
The following constructs bind names: formal parameters to functions,
:keyword:`import` statements, class and function definitions (these bind the
class or function name in the defining block), and targets that are identifiers
-if occurring in an assignment, :keyword:`for` loop header, or in the second
-position of an :keyword:`except` clause header. The :keyword:`import` statement
-of the form "``from ...import *``" binds all names defined in the imported
+if occurring in an assignment, :keyword:`for` loop header, in the second
+position of an :keyword:`except` clause header or after :keyword:`as` in a
+:keyword:`with` statement. The :keyword:`import` statement
+of the form ``from ... import *`` binds all names defined in the imported
module, except those beginning with an underscore. This form may only be used
at the module level.