diff options
| author | Raymond Hettinger <python@rcn.com> | 2004-08-03 05:17:58 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2004-08-03 05:17:58 (GMT) |
| commit | 70fcdb8be0ef544432b8bd48a0abd0475f0fb778 (patch) | |
| tree | 6f26ba6f61543a000f0843510afaf2418bcf0886 | |
| parent | a57ec93b934b1c04ab837aa541fc7101c6bc0055 (diff) | |
| download | cpython-70fcdb8be0ef544432b8bd48a0abd0475f0fb778.zip cpython-70fcdb8be0ef544432b8bd48a0abd0475f0fb778.tar.gz cpython-70fcdb8be0ef544432b8bd48a0abd0475f0fb778.tar.bz2 | |
Document general mappings for the locals argument for exec and execfile().
| -rw-r--r-- | Doc/lib/libfuncs.tex | 15 | ||||
| -rw-r--r-- | Doc/ref/ref6.tex | 5 |
2 files changed, 11 insertions, 9 deletions
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex index b3d3d30..ec6a66c 100644 --- a/Doc/lib/libfuncs.tex +++ b/Doc/lib/libfuncs.tex @@ -343,13 +343,14 @@ class C: and does not create a new module.\footnote{It is used relatively rarely so does not warrant being made into a statement.} - The arguments are a file name and two optional dictionaries. The - file is parsed and evaluated as a sequence of Python statements - (similarly to a module) using the \var{globals} and \var{locals} - dictionaries as global and local namespace. If the \var{locals} - dictionary is omitted it defaults to the \var{globals} dictionary. - If both dictionaries are omitted, the expression is executed in the - environment where \function{execfile()} is called. The return value is + The arguments are a file name and two optional dictionaries. The file is + parsed and evaluated as a sequence of Python statements (similarly to a + module) using the \var{globals} and \var{locals} dictionaries as global and + local namespace. If provided, \var{locals} can be any mapping object. + \versionchanged[formerly \var{locals} was required to be a dictionary]{2.4} + If the \var{locals} dictionary is omitted it defaults to the \var{globals} + dictionary. If both dictionaries are omitted, the expression is executed in + the environment where \function{execfile()} is called. The return value is \code{None}. \warning{The default \var{locals} act as described for function diff --git a/Doc/ref/ref6.tex b/Doc/ref/ref6.tex index a389176..1017aca 100644 --- a/Doc/ref/ref6.tex +++ b/Doc/ref/ref6.tex @@ -873,8 +873,9 @@ In all cases, if the optional parts are omitted, the code is executed in the current scope. If only the first expression after \keyword{in} is specified, it should be a dictionary, which will be used for both the global and the local variables. If two expressions are given, -both must be dictionaries and they are used for the global and local -variables, respectively. +they are used for the global and local variables, respectively. +If provided, \var{locals} can be any mapping object. +\versionchanged[formerly \var{locals} was required to be a dictionary]{2.4} As a side effect, an implementation may insert additional keys into the dictionaries given besides those corresponding to variable names |