From ebac19dad6263141d5db0a2c923efe049dba99d2 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 1 Dec 2017 20:09:52 +0100 Subject: 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 --- Python/pylifecycle.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'Python/pylifecycle.c') diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index f0a49f91fb..a1b29f2a0e 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; } -- cgit v1.2.1