diff options
Diffstat (limited to 'Doc/ref')
| -rw-r--r-- | Doc/ref/ref4.tex | 7 | ||||
| -rw-r--r-- | Doc/ref/ref8.tex | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Doc/ref/ref4.tex b/Doc/ref/ref4.tex index f8677b5..62db120 100644 --- a/Doc/ref/ref4.tex +++ b/Doc/ref/ref4.tex @@ -19,8 +19,9 @@ part of their execution, e.g. by invoking (calling) a function. The following are code blocks: A module is a code block. A function body is a code block. A class definition is a code block. Each command typed interactively is a separate code block; a script file is -a code block. The string argument passed to the built-in functions -\verb\eval\ and \verb\exec\ are code blocks. And finally, the +a code block. The string argument passed to the built-in function +\verb\eval\ and to the \verb\exec\ statement are code blocks. +And finally, the expression read and evaluated by the built-in function \verb\input\ is a code block. @@ -66,7 +67,7 @@ assignment, \verb\for\ loop header, or \verb\except\ clause header. When a global name is not found in the global name space, it is searched in the list of ``built-in'' names (which is actually the -global name space of the module \verb\builtin\). When a name is not +global name space of the module \verb\__builtin__\). When a name is not found at all, the \verb\NameError\ exception is raised. The following table lists the meaning of the local and global name diff --git a/Doc/ref/ref8.tex b/Doc/ref/ref8.tex index 59ef58c..aeb65bf 100644 --- a/Doc/ref/ref8.tex +++ b/Doc/ref/ref8.tex @@ -14,13 +14,13 @@ interpreter is invoked, it is useful to have a notion of a complete Python program. A complete Python program is executed in a minimally initialized environment: all built-in and standard modules are available, but none have been initialized, except for \verb\sys\ -(various system services), \verb\builtin\ (built-in functions, +(various system services), \verb\__builtin__\ (built-in functions, exceptions and \verb\None\) and \verb\__main__\. The latter is used to provide the local and global name space for execution of the complete program. \bimodindex{sys} \bimodindex{__main__} -\bimodindex{builtin} +\bimodindex{__builtin__} The syntax for a complete Python program is that for file input, described in the next section. @@ -58,11 +58,7 @@ This syntax is used in the following situations: \item when parsing a module; -\item when parsing a string passed to \verb\exec()\; -\bifuncindex{exec} - -\item when parsing a file passed to \verb\execfile()\; -\bifuncindex{execfile} +\item when parsing a string passed to the \verb\exec\ statement; \end{itemize} |