summaryrefslogtreecommitdiffstats
path: root/Python/frozenmain.c
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-10-01 10:26:04 (GMT)
committerGitHub <noreply@github.com>2019-10-01 10:26:04 (GMT)
commitd49f096cc41f57155efe71cd089c29b38c218488 (patch)
tree1830b017fe1259e6d5cc27390f0331a83b7d8ba2 /Python/frozenmain.c
parent938c00ca9e4207a2531041edff2e82490b02047f (diff)
downloadcpython-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/frozenmain.c')
-rw-r--r--Python/frozenmain.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index c56938a..7f9cc19 100644
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -40,11 +40,7 @@ Py_FrozenMain(int argc, char **argv)
}
PyConfig config;
- status = PyConfig_InitPythonConfig(&config);
- if (PyStatus_Exception(status)) {
- PyConfig_Clear(&config);
- Py_ExitStatusException(status);
- }
+ PyConfig_InitPythonConfig(&config);
config.pathconfig_warnings = 0; /* Suppress errors from getpath.c */
if ((p = Py_GETENV("PYTHONINSPECT")) && *p != '\0')