From: Georg Brandl Date: Sun, 15 Mar 2009 21:57:20 +0000 (+0000) Subject: Merged revisions 70397 via svnmerge from X-Git-Tag: v3.1a2~262 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f157864a0665d98e3adbf197798b1761a217f8b;p=python 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. ........ --- diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index cc9ee3dd8c..ca8bc2b203 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.