From 4bd023f88291cedbae91f2dea4b13509fc5c2d9a Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 27 Oct 1993 13:49:20 +0000 Subject: [PATCH] * lib3.tex (module string): added rindex(). * lib1.tex (section{Built-in Functions}): added bagof(), lambda(), map() and reduce(). Repharased apply(). Removed or rephrased references to exec() (now the exec stmt). * lib4.tex: posix.exec --> posix.execv * ref4.tex, ref8.tex, tut.tex: builtin --> __builtin__ * lib3.tex (module string): added atof() and atol(), and ato[fl]_error. --- Doc/ref/ref4.tex | 7 ++++--- Doc/ref/ref8.tex | 10 +++------- Doc/ref4.tex | 7 ++++--- Doc/ref8.tex | 10 +++------- Doc/tut.tex | 21 ++++++++++++--------- Doc/tut/tut.tex | 21 ++++++++++++--------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Doc/ref/ref4.tex b/Doc/ref/ref4.tex index f8677b5bc4b..62db1209893 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 59ef58cb46f..aeb65bf7211 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} diff --git a/Doc/ref4.tex b/Doc/ref4.tex index f8677b5bc4b..62db1209893 100644 --- a/Doc/ref4.tex +++ b/Doc/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/ref8.tex b/Doc/ref8.tex index 59ef58cb46f..aeb65bf7211 100644 --- a/Doc/ref8.tex +++ b/Doc/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} diff --git a/Doc/tut.tex b/Doc/tut.tex index a51fb83657d..3aaeba9dd28 100644 --- a/Doc/tut.tex +++ b/Doc/tut.tex @@ -1605,15 +1605,19 @@ Note that it lists all types of names: variables, modules, functions, etc. {\tt dir()} does not list the names of built-in functions and variables. If you want a list of those, they are defined in the standard module -{\tt builtin}: +{\tt __builtin__}: \bcode\begin{verbatim} ->>> import builtin ->>> dir(builtin) -['EOFError', 'KeyboardInterrupt', 'MemoryError', 'NameError', 'None', 'Runti -meError', 'SystemError', 'TypeError', 'abs', 'chr', 'dir', 'divmod', 'eval', - 'exec', 'float', 'input', 'int', 'len', 'long', 'max', 'min', 'open', 'ord' -, 'pow', 'range', 'raw_input', 'reload', 'type'] +>>> import __builtin__ +>>> dir(__builtin__) +['AccessError', 'AttributeError', 'ConflictError', 'EOFError', 'IOError', 'I +mportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', ' +NameError', 'None', 'OverflowError', 'RuntimeError', 'SyntaxError', 'SystemE +rror', 'SystemExit', 'TypeError', 'ValueError', 'ZeroDivisionError', 'abs', +'apply', 'chr', 'cmp', 'coerce', 'compile', 'dir', 'divmod', 'eval', 'execfi +le', 'float', 'getattr', 'hasattr', 'hash', 'hex', 'id', 'input', 'int', 'le +n', 'long', 'max', 'min', 'oct', 'open', 'ord', 'pow', 'range', 'raw_input', + 'reload', 'repr', 'round', 'setattr', 'str', 'type'] >>> \end{verbatim}\ecode @@ -2083,8 +2087,7 @@ interpreter quits. The statements executed by the top-level invocation of the interpreter, either read from a script file or interactively, are considered part of a module called \verb\__main__\, so they have their own global name space. (The built-in names -actually also live in a module; this is called \verb\builtin\, -although it should really have been called \verb\__builtin__\.) +actually also live in a module; this is called \verb\__builtin__\.) The local name space for a function is created when the function is called, and deleted when the function returns or raises an exception diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex index a51fb83657d..3aaeba9dd28 100644 --- a/Doc/tut/tut.tex +++ b/Doc/tut/tut.tex @@ -1605,15 +1605,19 @@ Note that it lists all types of names: variables, modules, functions, etc. {\tt dir()} does not list the names of built-in functions and variables. If you want a list of those, they are defined in the standard module -{\tt builtin}: +{\tt __builtin__}: \bcode\begin{verbatim} ->>> import builtin ->>> dir(builtin) -['EOFError', 'KeyboardInterrupt', 'MemoryError', 'NameError', 'None', 'Runti -meError', 'SystemError', 'TypeError', 'abs', 'chr', 'dir', 'divmod', 'eval', - 'exec', 'float', 'input', 'int', 'len', 'long', 'max', 'min', 'open', 'ord' -, 'pow', 'range', 'raw_input', 'reload', 'type'] +>>> import __builtin__ +>>> dir(__builtin__) +['AccessError', 'AttributeError', 'ConflictError', 'EOFError', 'IOError', 'I +mportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', ' +NameError', 'None', 'OverflowError', 'RuntimeError', 'SyntaxError', 'SystemE +rror', 'SystemExit', 'TypeError', 'ValueError', 'ZeroDivisionError', 'abs', +'apply', 'chr', 'cmp', 'coerce', 'compile', 'dir', 'divmod', 'eval', 'execfi +le', 'float', 'getattr', 'hasattr', 'hash', 'hex', 'id', 'input', 'int', 'le +n', 'long', 'max', 'min', 'oct', 'open', 'ord', 'pow', 'range', 'raw_input', + 'reload', 'repr', 'round', 'setattr', 'str', 'type'] >>> \end{verbatim}\ecode @@ -2083,8 +2087,7 @@ interpreter quits. The statements executed by the top-level invocation of the interpreter, either read from a script file or interactively, are considered part of a module called \verb\__main__\, so they have their own global name space. (The built-in names -actually also live in a module; this is called \verb\builtin\, -although it should really have been called \verb\__builtin__\.) +actually also live in a module; this is called \verb\__builtin__\.) The local name space for a function is created when the function is called, and deleted when the function returns or raises an exception