diff options
| author | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
| commit | e21a531ef10e120a94434b3d4806a8106dd6f271 (patch) | |
| tree | 0b1d0245388effa5cbf130744b50af6ab6a1eb5f /Doc/reference/executionmodel.rst | |
| parent | fe98180bced16be7d62b762cc85d400f929d0885 (diff) | |
| parent | a4c8c47961305487ef6c40a6d882bb956f2c5a0b (diff) | |
| download | cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.zip cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.gz cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/reference/executionmodel.rst')
| -rw-r--r-- | Doc/reference/executionmodel.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst index 664d736..a3948e3 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -111,8 +111,9 @@ 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 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. +global namespace is searched first. If the name is not found there, the +builtins namespace is searched. The :keyword:`global` statement must precede +all uses of the name. .. XXX document "nonlocal" semantics here |