summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doc/library/functions.rst5
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 4 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 3fcd6941c2..b6252e629b 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -417,7 +417,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
diff --git a/Misc/NEWS b/Misc/NEWS
index 5c05e0257c..2e2b03fb65 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -380,14 +380,14 @@ Build
Documentation
-------------
+- Issue #13557: Clarify effect of giving two different namespaces to exec or
+ execfile().
+
- Issue #8799: Fix and improve the threading.Condition documentation.
- Issue #14943: Correct a default argument value for winreg.OpenKey
and correctly list the argument names in the function's explanation.
-Documentation
--------------
-
- Issue #14034: added the argparse tutorial.
Tools/Demos