summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-12-01 19:09:52 (GMT)
committerGitHub <noreply@github.com>2017-12-01 19:09:52 (GMT)
commitebac19dad6263141d5db0a2c923efe049dba99d2 (patch)
tree9dd0111510cfc339f2e88c24592d04bf11e0a17b /Python
parent9ac3d8882712c9675c3d2f9f84af6b5729575cde (diff)
downloadcpython-ebac19dad6263141d5db0a2c923efe049dba99d2.zip
cpython-ebac19dad6263141d5db0a2c923efe049dba99d2.tar.gz
cpython-ebac19dad6263141d5db0a2c923efe049dba99d2.tar.bz2
bpo-32030: Don't call _PyPathConfig_Fini() in Py_FinalizeEx() (#4667)
Changes: * _PyPathConfig_Fini() cannot be called in Py_FinalizeEx(). Py_Initialize() and Py_Finalize() can be called multiple times, but it must not "forget" parameters set by Py_SetProgramName(), Py_SetPath() or Py_SetPythonHome(), whereas _PyPathConfig_Fini() clear all these parameters. * config_get_program_name() and calculate_program_full_path() now also decode paths using Py_DecodeLocale() to use the surrogateescape error handler, rather than decoding using mbstowcs() which is strict. * Change _Py_CheckPython3() prototype: () => (void) * Truncate a few lines which were too long
Diffstat (limited to 'Python')
-rw-r--r--Python/pylifecycle.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index f0a49f9..a1b29f2 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1273,8 +1273,6 @@ Py_FinalizeEx(void)
call_ll_exitfuncs();
- _PyPathConfig_Fini();
-
_PyRuntime_Finalize();
return status;
}