Merge #6498 fix from 3.1.
This commit is contained in:
commit
318e62153b
|
@ -34,11 +34,12 @@ the same library that the Python runtime is using.
|
||||||
according to the user's locale). It is important to note that the
|
according to the user's locale). It is important to note that the
|
||||||
argument list may be modified (but the contents of the strings
|
argument list may be modified (but the contents of the strings
|
||||||
pointed to by the argument list are not). The return value will be
|
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
|
```0``` if the interpreter exits normally (ie, without an
|
||||||
interpreter exits due to an exception, or ``2`` if the parameter
|
exception), ``1`` if the interpreter exits due to an exception, or
|
||||||
list does not represent a valid Python command line.
|
``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
|
function will not return ``1``, but exit the process, as long as
|
||||||
``Py_InspectFlag`` is not set.
|
``Py_InspectFlag`` is not set.
|
||||||
|
|
||||||
|
@ -85,7 +86,7 @@ the same library that the Python runtime is using.
|
||||||
there was an error, there is no way to get the exception information. For the
|
there was an error, there is no way to get the exception information. For the
|
||||||
meaning of *flags*, see below.
|
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
|
function will not return ``-1``, but exit the process, as long as
|
||||||
``Py_InspectFlag`` is not set.
|
``Py_InspectFlag`` is not set.
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,7 @@ int Py_DebugFlag; /* Needed by parser.c */
|
||||||
int Py_VerboseFlag; /* Needed by import.c */
|
int Py_VerboseFlag; /* Needed by import.c */
|
||||||
int Py_QuietFlag; /* Needed by sysmodule.c */
|
int Py_QuietFlag; /* Needed by sysmodule.c */
|
||||||
int Py_InteractiveFlag; /* Needed by Py_FdIsInteractive() below */
|
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_NoSiteFlag; /* Suppress 'import site' */
|
||||||
int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
|
int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
|
||||||
int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
|
int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
|
||||||
|
|
Loading…
Reference in New Issue