bpo-34170: _PyCoreConfig_Read() don't replace coerce_c_locale (GH-8658)
If coerce_c_locale is already set (>= 0), use its value: don't
override it.
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 829592c..1a32525 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -367,6 +367,8 @@
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) {
@@ -665,16 +667,18 @@
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;
+ }
}
}
@@ -820,10 +824,6 @@
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) {
@@ -832,7 +832,6 @@
if (config->coerce_c_locale < 0) {
config->coerce_c_locale = 1;
}
- return;
}
}
@@ -909,7 +908,9 @@
}
}
- 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);