cpython: 94e3c44b0662 (original) (raw)

Mercurial > cpython

changeset 70134:94e3c44b0662

Merge #6498 fix from 3.2. [#6498]

Georg Brandl georg@python.org
date	Sun, 15 May 2011 08:49:38 +0200
parents	0bdf5c7e60e8(current diff)7089afd69a1a(diff)
children	c2515cb23d9b
files	Python/pythonrun.c
diffstat	2 files changed, 7 insertions(+), 6 deletions(-)[+] [-] Doc/c-api/veryhigh.rst 11 Python/pythonrun.c 2

line wrap: on

line diff

--- a/Doc/c-api/veryhigh.rst +++ b/Doc/c-api/veryhigh.rst @@ -34,11 +34,12 @@ the same library that the Python runtime according to the user's locale). It is important to note that the argument list may be modified (but the contents of the strings pointed to by the argument list are not). The return value will be

the integer passed to the :func:sys.exit function, 1 if the
interpreter exits due to an exception, or 2 if the parameter
list does not represent a valid Python command line.

0 if the interpreter exits normally (ie, without an
exception), 1 if the interpreter exits due to an exception, or
2 if the parameter list does not represent a valid Python
command line.

Note that if an otherwise unhandled :exc:SystemError is raised, this

Note that if an otherwise unhandled :exc:SystemExit is raised, this function will not return 1, but exit the process, as long as Py_InspectFlag is not set.

@@ -85,7 +86,7 @@ the same library that the Python runtime there was an error, there is no way to get the exception information. For the meaning of flags, see below.

Note that if an otherwise unhandled :exc:SystemError is raised, this

Note that if an otherwise unhandled :exc:SystemExit is raised, this function will not return -1, but exit the process, as long as Py_InspectFlag is not set.

--- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -83,7 +83,7 @@ int Py_DebugFlag; /* Needed by parser.c int Py_VerboseFlag; /* Needed by import.c / int Py_QuietFlag; / Needed by sysmodule.c / int Py_InteractiveFlag; / Needed by Py_FdIsInteractive() below / -int Py_InspectFlag; / Needed to determine whether to exit at SystemError / +int Py_InspectFlag; / Needed to determine whether to exit at SystemExit / int Py_NoSiteFlag; / Suppress 'import site' / int Py_BytesWarningFlag; / Warn on str(bytes) and str(buffer) / int Py_DontWriteBytecodeFlag; / Suppress writing bytecode files (*.py[co]) */