bpo-34170: _PyCoreConfig_Read() don't replace coerce_c_locale by vstinner · Pull Request #8658 · python/cpython

Expand Up @@ -367,6 +367,8 @@ _PyCoreConfig_SetGlobalConfig(const _PyCoreConfig *config) static _PyInitError config_init_program_name(_PyCoreConfig *config) { assert(config->program_name == NULL);
/* If Py_SetProgramName() was called, use its value */ const wchar_t *program_name = _Py_path_config.program_name; if (program_name != NULL) { Expand Down Expand Up @@ -665,16 +667,18 @@ config_read_env_vars(_PyCoreConfig *config) config->malloc_stats = 1; }
const char *env = _PyCoreConfig_GetEnv(config, "PYTHONCOERCECLOCALE"); if (env) { if (strcmp(env, "0") == 0) { config->coerce_c_locale = 0; } else if (strcmp(env, "warn") == 0) { config->coerce_c_locale_warn = 1; } else { config->coerce_c_locale = 1; if (config->coerce_c_locale < 0) { const char *env = _PyCoreConfig_GetEnv(config, "PYTHONCOERCECLOCALE"); if (env) { if (strcmp(env, "0") == 0) { config->coerce_c_locale = 0; } else if (strcmp(env, "warn") == 0) { config->coerce_c_locale_warn = 1; } else { config->coerce_c_locale = 1; } } }
Expand Down Expand Up @@ -820,10 +824,6 @@ config_read_complex_options(_PyCoreConfig *config) static void config_init_locale(_PyCoreConfig *config) { if (config->utf8_mode >= 0 && config->coerce_c_locale >= 0) { return; }
if (_Py_LegacyLocaleDetected()) { /* POSIX locale: enable C locale coercion and UTF-8 Mode */ if (config->utf8_mode < 0) { Expand All @@ -832,7 +832,6 @@ config_init_locale(_PyCoreConfig *config) if (config->coerce_c_locale < 0) { config->coerce_c_locale = 1; } return; } }
Expand Down Expand Up @@ -909,7 +908,9 @@ _PyCoreConfig_Read(_PyCoreConfig *config) } }
config_init_locale(config); if (config->utf8_mode < 0 || config->coerce_c_locale < 0) { config_init_locale(config); }
if (config->_install_importlib) { err = _PyCoreConfig_InitPathConfig(config); Expand Down