diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-05-01 03:35:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 03:35:33 (GMT) |
| commit | db7197543112954b0912e3d46e39fefcb1c3b950 (patch) | |
| tree | 0c82232775c6b1a03671054f9e70f2bb99e6adc9 /Modules | |
| parent | c4e671eec20dfcb29b18596a89ef075f826c9f96 (diff) | |
| download | cpython-db7197543112954b0912e3d46e39fefcb1c3b950.zip cpython-db7197543112954b0912e3d46e39fefcb1c3b950.tar.gz cpython-db7197543112954b0912e3d46e39fefcb1c3b950.tar.bz2 | |
bpo-36763: Rework _PyInitError API (GH-13031)
* Remove _PyInitError.user_err field and _Py_INIT_USER_ERR() macro:
use _Py_INIT_ERR() instead. _Py_ExitInitError() now longer calls
abort() on error: exit with exit code 1 instead.
* Add _PyInitError._type private field.
* exitcode field type is now unsigned int on Windows.
* Rename prefix field to _func.
* Rename msg field to err_msg.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/getpath.c | 4 | ||||
| -rw-r--r-- | Modules/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index dd188c6..3991ad7 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -114,10 +114,10 @@ extern "C" { #define DECODE_LOCALE_ERR(NAME, LEN) \ ((LEN) == (size_t)-2) \ - ? _Py_INIT_USER_ERR("cannot decode " NAME) \ + ? _Py_INIT_ERR("cannot decode " NAME) \ : _Py_INIT_NO_MEMORY() -#define PATHLEN_ERR() _Py_INIT_USER_ERR("path configuration: path too long") +#define PATHLEN_ERR() _Py_INIT_ERR("path configuration: path too long") typedef struct { wchar_t *path_env; /* PATH environment variable */ diff --git a/Modules/main.c b/Modules/main.c index 68f0b99..575683c 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -570,7 +570,7 @@ exit_sigint(void) static void _Py_NO_RETURN pymain_exit_error(_PyInitError err) { - if (_Py_INIT_HAS_EXITCODE(err)) { + if (_Py_INIT_IS_EXIT(err)) { /* If it's an error rather than a regular exit, leave Python runtime alive: _Py_ExitInitError() uses the current exception and use sys.stdout in this case. */ |