Mercurial > cpython-lru_cache-weakref
diff Doc/reference/executionmodel.rst @ 56818:3e15a07a32fa 2.6
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.
........
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Tue, 27 Oct 2009 14:37:48 +0000 |
| parents | 503f0f41f35f |
| children | b7b8970cd5a5 |
line wrap: on
line diff
--- a/Doc/reference/executionmodel.rst Tue Oct 27 14:36:50 2009 +0000 +++ b/Doc/reference/executionmodel.rst Tue Oct 27 14:37:48 2009 +0000 @@ -112,9 +112,9 @@ If the 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 +i.e. the namespace of the module containing the code block, and the builtins namespace, the namespace of the module :mod:`__builtin__`. The global namespace -is searched first. If the name is not found there, the builtin namespace is +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. .. index:: pair: restricted; execution