diff options
| author | Georg Brandl <georg@python.org> | 2009-07-26 14:54:51 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-07-26 14:54:51 +0000 |
| commit | 22b3431426349a424e3486c279db8b84cf671da0 (patch) | |
| tree | db3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/reference/executionmodel.rst | |
| parent | 7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff) | |
| download | cpython-git-22b3431426349a424e3486c279db8b84cf671da0.tar.gz | |
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line
builtin -> built-in.
........
Diffstat (limited to 'Doc/reference/executionmodel.rst')
| -rw-r--r-- | Doc/reference/executionmodel.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index 92a1b31fa6..68ee654175 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -112,8 +112,8 @@ If the :keyword:`global` statement occurs within a block, all uses of the name specified in the statement refer to the binding of that name in the top-level namespace. Names are resolved in the top-level namespace by searching the global namespace, i.e. the namespace of the module containing the code block, -and the builtin namespace, the namespace of the module :mod:`builtins`. The -global namespace is searched first. If the name is not found there, the builtin +and the builtins namespace, the namespace of the module :mod:`builtins`. The +global namespace is searched first. If the name is not found there, the builtins namespace is searched. The global statement must precede all uses of the name. .. XXX document "nonlocal" semantics here |