diff options
author | Victor Stinner <vstinner@redhat.com> | 2019-05-16 14:39:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-16 14:39:26 (GMT) |
commit | dbacfc227381fbc7b3c886ea0bd7806ab3dc62c2 (patch) | |
tree | 7669139306b262719531d501001f417fb113f17b /Include/cpython | |
parent | 6e7890028213b30939327e7cf885bf097fc14472 (diff) | |
download | cpython-dbacfc227381fbc7b3c886ea0bd7806ab3dc62c2.zip cpython-dbacfc227381fbc7b3c886ea0bd7806ab3dc62c2.tar.gz cpython-dbacfc227381fbc7b3c886ea0bd7806ab3dc62c2.tar.bz2 |
bpo-36763: _PyInitError always use int for exitcode (GH-13360)
We cannot use "unsigned int" for exitcode on Windows, since
Py_Main() and _Py_RunMain() always return an "int".
Changes:
* _PyPathConfig_ComputeSysPath0() now returns -1 if an exception is
raised.
* pymain_run_python() no longer uses _PyInitError but display the
exception and set exitcode to 1 in case of error.
* Fix _Py_RunMain(): return an exitcode rather than calling
exit() on pymain_run_python() failure.
* _Py_ExitInitError() no longer uses ExitProcess() on Windows, use
exit() on all platforms.
* _Py_ExitInitError() now fails with a fatal error if 'err' is not an
error not an exit.
Diffstat (limited to 'Include/cpython')
-rw-r--r-- | Include/cpython/coreconfig.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Include/cpython/coreconfig.h b/Include/cpython/coreconfig.h index 47a6baa..f9bde14 100644 --- a/Include/cpython/coreconfig.h +++ b/Include/cpython/coreconfig.h @@ -15,11 +15,7 @@ typedef struct { } _type; const char *_func; const char *err_msg; -#ifdef MS_WINDOWS - unsigned int exitcode; -#else int exitcode; -#endif } _PyInitError; /* Almost all errors causing Python initialization to fail */ |