diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-10-01 10:26:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 10:26:04 (GMT) |
| commit | d49f096cc41f57155efe71cd089c29b38c218488 (patch) | |
| tree | 1830b017fe1259e6d5cc27390f0331a83b7d8ba2 /Python/pylifecycle.c | |
| parent | 938c00ca9e4207a2531041edff2e82490b02047f (diff) | |
| download | cpython-d49f096cc41f57155efe71cd089c29b38c218488.zip cpython-d49f096cc41f57155efe71cd089c29b38c218488.tar.gz cpython-d49f096cc41f57155efe71cd089c29b38c218488.tar.bz2 | |
bpo-38304: PyConfig_InitPythonConfig() cannot fail anymore (GH-16509)
PyConfig_InitPythonConfig() and PyConfig_InitIsolatedConfig() no
longer return PyStatus: they cannot fail anymore.
(cherry picked from commit 8462a4936b3a551dc546a6adea04a70b0a07ca67)
Co-authored-by: Victor Stinner <vstinner@redhat.com>
Diffstat (limited to 'Python/pylifecycle.c')
| -rw-r--r-- | Python/pylifecycle.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 5174f74..feb9285 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -843,11 +843,7 @@ pyinit_core(_PyRuntimeState *runtime, } PyConfig config; - - status = _PyConfig_InitCompatConfig(&config); - if (_PyStatus_EXCEPTION(status)) { - goto done; - } + _PyConfig_InitCompatConfig(&config); status = _PyConfig_Copy(&config, src_config); if (_PyStatus_EXCEPTION(status)) { @@ -1070,11 +1066,7 @@ Py_InitializeEx(int install_sigs) } PyConfig config; - - status = _PyConfig_InitCompatConfig(&config); - if (_PyStatus_EXCEPTION(status)) { - Py_ExitStatusException(status); - } + _PyConfig_InitCompatConfig(&config); config.install_signal_handlers = install_sigs; |