diff options
| author | Georg Brandl <georg@python.org> | 2009-03-15 21:57:20 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-03-15 21:57:20 (GMT) |
| commit | 7f157864a0665d98e3adbf197798b1761a217f8b (patch) | |
| tree | 14dabda2cc507a179fdd748b6a9f7a57ed879c5c /Doc/reference | |
| parent | 9309583176e79beb00d97c634e729f9859ca65ab (diff) | |
| download | cpython-7f157864a0665d98e3adbf197798b1761a217f8b.zip cpython-7f157864a0665d98e3adbf197798b1761a217f8b.tar.gz cpython-7f157864a0665d98e3adbf197798b1761a217f8b.tar.bz2 | |
Merged revisions 70397 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70397 | georg.brandl | 2009-03-15 22:53:56 +0100 (So, 15 Mär 2009) | 1 line
#5469: add with statement to list of name-binding constructs.
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/executionmodel.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index cc9ee3d..ca8bc2b 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -86,9 +86,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, or after +:keyword:`as` in a :keyword:`with` statement or :keyword.`except` clause. +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. |