summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-05-15 06:49:12 (GMT)
committerGeorg Brandl <georg@python.org>2011-05-15 06:49:12 (GMT)
commit0b2489e986dd8fa3c58c242dd30559fce5135aaa (patch)
tree6c6179aaf195eec834cc4fe0cb15584f02fb4ef4
parent1161a9ca4059ab34f637574e7498ba79ecd6efea (diff)
downloadcpython-0b2489e986dd8fa3c58c242dd30559fce5135aaa.zip
cpython-0b2489e986dd8fa3c58c242dd30559fce5135aaa.tar.gz
cpython-0b2489e986dd8fa3c58c242dd30559fce5135aaa.tar.bz2
Closes #6498: fix several misspellings of "SystemExit" as "SystemError".
-rw-r--r--Doc/c-api/veryhigh.rst11
-rw-r--r--Python/pythonrun.c2
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/c-api/veryhigh.rst b/Doc/c-api/veryhigh.rst
index 66789a9..d1940a8 100644
--- a/Doc/c-api/veryhigh.rst
+++ b/Doc/c-api/veryhigh.rst
@@ -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
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.
@@ -84,7 +85,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
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.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index c6cf088..c4ae921 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -82,7 +82,7 @@ extern void _PyGILState_Fini(void);
int Py_DebugFlag; /* Needed by parser.c */
int Py_VerboseFlag; /* Needed by import.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]) */