diff options
| author | Georg Brandl <georg@python.org> | 2010-03-14 10:56:14 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-03-14 10:56:14 (GMT) |
| commit | 93dc9eb2a39ccc84d50012f8133f05e81183e8a6 (patch) | |
| tree | 6f4fd2b8f7c457f56508450b8ba735e7169ebae1 /Doc/reference/executionmodel.rst | |
| parent | c0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f (diff) | |
| download | cpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.zip cpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.tar.gz cpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.tar.bz2 | |
Merged revisions 78760,78771-78773,78802,78922,78952 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line
#5341: more built-in vs builtin fixes.
........
r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line
#8085: The function is called PyObject_NewVar, not PyObject_VarNew.
........
r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line
#8039: document conditional expressions better, giving them their own section.
........
r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line
#8044: document Py_{Enter,Leave}RecursiveCall functions.
........
r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line
Fix typo.
........
r78922 | georg.brandl | 2010-03-13 14:41:58 +0100 (Sa, 13 Mär 2010) | 1 line
Update for new download location.
........
r78952 | georg.brandl | 2010-03-14 10:55:08 +0100 (So, 14 Mär 2010) | 1 line
#8137: add iso-8859-16 to the standard encodings table.
........
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 90791d2..b4c29b1 100644 --- a/Doc/reference/executionmodel.rst +++ b/Doc/reference/executionmodel.rst @@ -120,7 +120,7 @@ namespace is searched. The global statement must precede all uses of the name. .. index:: pair: restricted; execution -The built-in namespace associated with the execution of a code block is actually +The builtins namespace associated with the execution of a code block is actually found by looking up the name ``__builtins__`` in its global namespace; this should be a dictionary or a module (in the latter case the module's dictionary is used). By default, when in the :mod:`__main__` module, ``__builtins__`` is @@ -132,7 +132,7 @@ weak form of restricted execution. .. impl-detail:: Users should not touch ``__builtins__``; it is strictly an implementation - detail. Users wanting to override values in the built-in namespace should + detail. Users wanting to override values in the builtins namespace should :keyword:`import` the :mod:`builtins` module and modify its attributes appropriately. |