1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.2 closes issue 13557

Browse Source
This commit is contained in:
Terry Jan Reedy 2012-07-08 17:52:58 -04:00
commit dd445e8ece
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/functions.rst
View File

@ -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 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 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, *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 If the *globals* dictionary does not contain a value for the key
``__builtins__``, a reference to the dictionary of the built-in module ``__builtins__``, a reference to the dictionary of the built-in module

6
Misc/NEWS
View File

@ -98,6 +98,12 @@ Tools/Demos
* C frames that are garbage-collecting * C frames that are garbage-collecting
* C frames that are due to the invocation of a PyCFunction * 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 Tests
----- -----