diff options
| author | Georg Brandl <georg@python.org> | 2010-02-06 18:46:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-02-06 18:46:57 (GMT) |
| commit | c4a55fccaba4936458c32f5f3b3913fcf2848b42 (patch) | |
| tree | a90e0efacec59c07bc943ba8ab8593a3a1f6f4ed /Doc/reference | |
| parent | 3102bd9afe7fe657a8e3533b5cdee3e5e9282f27 (diff) | |
| download | cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.zip cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.gz cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.bz2 | |
Recorded merge of revisions 78024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78024 | georg.brandl | 2010-02-06 19:44:44 +0100 (Sa, 06 Feb 2010) | 1 line
#5341: fix "builtin" where used as an adjective ("built-in" is correct).
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index b1be34a..99ff248 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -953,7 +953,7 @@ definition, function definition, or :keyword:`import` statement. **Programmer's note:** the :keyword:`global` is a directive to the parser. It applies only to code parsed at the same time as the :keyword:`global` statement. In particular, a :keyword:`global` statement contained in a string or code -object supplied to the builtin :func:`exec` function does not affect the code +object supplied to the built-in :func:`exec` function does not affect the code block *containing* the function call, and code contained in such a string is unaffected by :keyword:`global` statements in the code containing the function call. The same applies to the :func:`eval` and :func:`compile` functions. |