diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-09-17 23:22:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 23:22:29 (GMT) |
| commit | 7a0791b6992d420dc52536257f2f093851ed7215 (patch) | |
| tree | d41edd6bc79c92232213480fc853dd86530780bf /Python | |
| parent | 1fa2ec49bec50bea1847b558b883c5c904334734 (diff) | |
| download | cpython-7a0791b6992d420dc52536257f2f093851ed7215.zip cpython-7a0791b6992d420dc52536257f2f093851ed7215.tar.gz cpython-7a0791b6992d420dc52536257f2f093851ed7215.tar.bz2 | |
bpo-34589: C locale coercion off by default (GH-9073)
Py_Initialize() and Py_Main() cannot enable the C locale coercion
(PEP 538) anymore: it is always disabled. It can now only be enabled
by the Python program ("python3).
test_embed: get_filesystem_encoding() doesn't have to set PYTHONUTF8
nor PYTHONCOERCECLOCALE, these variables are already set in the
parent.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/coreconfig.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Python/coreconfig.c b/Python/coreconfig.c index 1e03ce3..131a043 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -816,7 +816,9 @@ config_read_env_vars(_PyCoreConfig *config) } } else if (strcmp(env, "warn") == 0) { - config->_coerce_c_locale_warn = 1; + if (config->_coerce_c_locale_warn < 0) { + config->_coerce_c_locale_warn = 1; + } } else { if (config->_coerce_c_locale < 0) { @@ -1324,6 +1326,9 @@ _PyCoreConfig_Read(_PyCoreConfig *config) if (config->_coerce_c_locale < 0) { config->_coerce_c_locale = 0; } + if (config->_coerce_c_locale_warn < 0) { + config->_coerce_c_locale_warn = 0; + } if (config->utf8_mode < 0) { config->utf8_mode = 0; } |