aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-10-01 12:06:16 +0200
committerGitHub <noreply@github.com>2019-10-01 12:06:16 +0200
commit8462a4936b3a551dc546a6adea04a70b0a07ca67 (patch)
tree3c4655f174d1aa9abcdb5226532db0e4d7434bca /Python/pathconfig.c
parentbpo-38304: Remove PyConfig.struct_size (GH-16500) (GH-16508) (diff)
downloadcpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.tar.gz
cpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.tar.bz2
cpython-8462a4936b3a551dc546a6adea04a70b0a07ca67.zip
bpo-38304: PyConfig_InitPythonConfig() cannot fail anymore (GH-16509)
PyConfig_InitPythonConfig() and PyConfig_InitIsolatedConfig() no longer return PyStatus: they cannot fail anymore.
Diffstat (limited to 'Python/pathconfig.c')
-rw-r--r--Python/pathconfig.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 5550194a5d5..61408e19e3a 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -432,16 +432,11 @@ _PyConfig_InitPathConfig(PyConfig *config)
static PyStatus
pathconfig_global_read(_PyPathConfig *pathconfig)
{
- PyStatus status;
PyConfig config;
-
- status = _PyConfig_InitCompatConfig(&config);
- if (_PyStatus_EXCEPTION(status)) {
- goto done;
- }
+ _PyConfig_InitCompatConfig(&config);
/* Call _PyConfig_InitPathConfig() */
- status = PyConfig_Read(&config);
+ PyStatus status = PyConfig_Read(&config);
if (_PyStatus_EXCEPTION(status)) {
goto done;
}