summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2012-07-08 21:52:58 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2012-07-08 21:52:58 (GMT)
commitdd445e8ece08b8bf62cb1a6d6aab203eb9b3f535 (patch)
tree8a855f96e9ed1a88d76d3083d6e30afdc764ea53 /Doc/library/functions.rst
parent1ced17dfe9ee17d35badd1dacc38cc12c1158c8c (diff)
parent83efd6cbb697fec5412ea7a987222baf18349a91 (diff)
downloadcpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.zip
cpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.tar.gz
cpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.tar.bz2
Merge 3.2 closes issue 13557
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 5254299..1cbe34a 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -413,7 +413,10 @@ are always available. They are listed here in alphabetical order.
current scope. If only *globals* is provided, it must be a dictionary, which
will be used for both the global and the local variables. If *globals* and
*locals* are given, they are used for the global and local variables,
- respectively. If provided, *locals* can be any mapping object.
+ respectively. If provided, *locals* can be any mapping object. Remember
+ that at module level, globals and locals are the same dictionary. If exec
+ gets two separate objects as *globals* and *locals*, the code will be
+ executed as if it were embedded in a class definition.
If the *globals* dictionary does not contain a value for the key
``__builtins__``, a reference to the dictionary of the built-in module