diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2012-07-08 21:52:58 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2012-07-08 21:52:58 (GMT) |
| commit | dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535 (patch) | |
| tree | 8a855f96e9ed1a88d76d3083d6e30afdc764ea53 | |
| parent | 1ced17dfe9ee17d35badd1dacc38cc12c1158c8c (diff) | |
| parent | 83efd6cbb697fec5412ea7a987222baf18349a91 (diff) | |
| download | cpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.zip cpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.tar.gz cpython-dd445e8ece08b8bf62cb1a6d6aab203eb9b3f535.tar.bz2 | |
Merge 3.2 closes issue 13557
| -rw-r--r-- | Doc/library/functions.rst | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
2 files changed, 10 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 @@ -98,6 +98,12 @@ Tools/Demos * C frames that are garbage-collecting * C frames that are due to the invocation of a PyCFunction +Documentation +------------- + +- Issue #13557: Clarify effect of giving two different namespaces to exec or + execfile(). + Tests ----- |