traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-34485: Fix _Py_InitializeCore() for C locale coercion (GH-8979) (GH-8981) 

* _Py_InitializeCore() now sets the LC_CTYPE locale to the user
  preferred locale before checking if the C locale should be coerced
  or not in _PyCoreConfig_Read().
* Fix pymain_read_conf(): remember if the C locale has been coerced
  when the configuration should be read again if the encoding has
  changed.

(cherry picked from commit 2c8ddcf4f1)
This commit is contained in:
Victor Stinner 2018-08-29 01:13:29 +02:00 committed by GitHub
parent 65ef7425a3
commit 98c49c6ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/main.c
View File

@ -1854,16 +1854,18 @@ config_read_env_vars(_PyCoreConfig *config)
config->malloc_stats = 1; config->malloc_stats = 1;
} }
if (config->coerce_c_locale < 0) { const char *env = config_get_env_var("PYTHONCOERCECLOCALE");
const char *env = config_get_env_var("PYTHONCOERCECLOCALE"); if (env) {
if (env) { if (strcmp(env, "0") == 0) {
if (strcmp(env, "0") == 0) { if (config->coerce_c_locale < 0) {
config->coerce_c_locale = 0; config->coerce_c_locale = 0;
} }
else if (strcmp(env, "warn") == 0) { }
config->coerce_c_locale_warn = 1; else if (strcmp(env, "warn") == 0) {
} config->coerce_c_locale_warn = 1;
else { }
else {
if (config->coerce_c_locale < 0) {
config->coerce_c_locale = 1; config->coerce_c_locale = 1;
} }
} }
@ -2044,7 +2046,7 @@ pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
* See the documentation of the PYTHONCOERCECLOCALE setting for more * See the documentation of the PYTHONCOERCECLOCALE setting for more
* details. * details.
*/ */
if (config->coerce_c_locale == 1 && !locale_coerced) { if (config->coerce_c_locale && !locale_coerced) {
locale_coerced = 1; locale_coerced = 1;
_Py_CoerceLegacyLocale(config); _Py_CoerceLegacyLocale(config);
encoding_changed = 1; encoding_changed = 1;
@ -2071,6 +2073,7 @@ pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
pymain_read_conf_impl(). Reset Py_IsolatedFlag and Py_NoSiteFlag pymain_read_conf_impl(). Reset Py_IsolatedFlag and Py_NoSiteFlag
modified by _PyCoreConfig_Read(). */ modified by _PyCoreConfig_Read(). */
int new_utf8_mode = config->utf8_mode; int new_utf8_mode = config->utf8_mode;
int new_coerce_c_locale = config->coerce_c_locale;
Py_IgnoreEnvironmentFlag = init_ignore_env; Py_IgnoreEnvironmentFlag = init_ignore_env;
if (_PyCoreConfig_Copy(config, &save_config) < 0) { if (_PyCoreConfig_Copy(config, &save_config) < 0) {
pymain->err = _Py_INIT_NO_MEMORY(); pymain->err = _Py_INIT_NO_MEMORY();
@ -2082,6 +2085,7 @@ pymain_read_conf(_PyMain *pymain, _Py_CommandLineDetails *cmdline)
cmdline_get_global_config(cmdline); cmdline_get_global_config(cmdline);
_PyCoreConfig_GetGlobalConfig(config); _PyCoreConfig_GetGlobalConfig(config);
config->utf8_mode = new_utf8_mode; config->utf8_mode = new_utf8_mode;
config->coerce_c_locale = new_coerce_c_locale;
/* The encoding changed: read again the configuration /* The encoding changed: read again the configuration
with the new encoding */ with the new encoding */

10
Python/pylifecycle.c
View File

@ -672,10 +672,6 @@ _Py_InitializeCore_impl(PyInterpreterState **interp_p,
_PyRuntime.finalizing = NULL; _PyRuntime.finalizing = NULL;
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
/* Set up the LC_CTYPE locale, so we can obtain
the locale's charset without having to switch
locales. */
_Py_SetLocaleFromEnv(LC_CTYPE);
_emit_stderr_warning_for_legacy_locale(core_config); _emit_stderr_warning_for_legacy_locale(core_config);
#endif #endif
@ -829,6 +825,12 @@ _Py_InitializeCore(PyInterpreterState **interp_p,
(and the input configuration is read only). */ (and the input configuration is read only). */
_PyCoreConfig config = _PyCoreConfig_INIT; _PyCoreConfig config = _PyCoreConfig_INIT;
#ifndef MS_WINDOWS
/* Set up the LC_CTYPE locale, so we can obtain the locale's charset
without having to switch locales. */
_Py_SetLocaleFromEnv(LC_CTYPE);
#endif
_PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc); _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
if (_PyCoreConfig_Copy(&config, src_config) >= 0) { if (_PyCoreConfig_Copy(&config, src_config) >= 0) {
err = _PyCoreConfig_Read(&config); err = _PyCoreConfig_Read(&config);