diff options
| author | Georg Brandl <georg@python.org> | 2010-10-06 10:38:58 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-10-06 10:38:58 (GMT) |
| commit | d098c3d94cd9bc74fa4d6f3a2752965e12860a03 (patch) | |
| tree | b62f15f6b3e28c65c8c11c0949f100cc70db5181 /Doc/reference/executionmodel.rst | |
| parent | c755e90288ba6cdb38f0fbcce297fd7fbe35cfe6 (diff) | |
| download | cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.zip cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.tar.gz cpython-d098c3d94cd9bc74fa4d6f3a2752965e12860a03.tar.bz2 | |
Merged revisions 85274 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r85274 | georg.brandl | 2010-10-06 12:26:05 +0200 (Mi, 06 Okt 2010) | 1 line
Fix errors found by "make suspicious".
........
Diffstat (limited to 'Doc/reference/executionmodel.rst')
| -rw-r--r-- | Doc/reference/executionmodel.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index b4c29b1..861163e 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -87,7 +87,7 @@ 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 after -:keyword:`as` in a :keyword:`with` statement or :keyword.`except` clause. +: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 |