diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-08-28 10:35:44 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-28 10:35:44 (GMT) |
commit | 5cb258950ce9b69b1f65646431c464c0c17b1510 (patch) | |
tree | 3f63a61cad2e65c83ab5f874a13a44def04bc182 /Python/coreconfig.c | |
parent | d658deac6060ee92b449a3bf424b460eafd99f3e (diff) | |
download | cpython-5cb258950ce9b69b1f65646431c464c0c17b1510.zip cpython-5cb258950ce9b69b1f65646431c464c0c17b1510.tar.gz cpython-5cb258950ce9b69b1f65646431c464c0c17b1510.tar.bz2 |
bpo-34527: POSIX locale enables the UTF-8 Mode (GH-8972)
* The UTF-8 Mode is now also enabled by the "POSIX" locale, not only
by the "C" locale.
* On FreeBSD, Py_DecodeLocale() and Py_EncodeLocale() now also forces
the ASCII encoding if the LC_CTYPE locale is "POSIX", not only if
the LC_CTYPE locale is "C".
* test_utf8_mode.test_cmd_line() checks also that the command line
arguments are decoded from UTF-8 when the the UTF-8 Mode is enabled
with POSIX locale or C locale.
Diffstat (limited to 'Python/coreconfig.c')
-rw-r--r-- | Python/coreconfig.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Python/coreconfig.c b/Python/coreconfig.c index 1b9e26e..acf4645 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -1,5 +1,6 @@ #include "Python.h" #include "internal/pystate.h" +#include <locale.h> #define DECODE_LOCALE_ERR(NAME, LEN) \ @@ -828,14 +829,21 @@ static void config_init_locale(_PyCoreConfig *config) { if (_Py_LegacyLocaleDetected()) { - /* POSIX locale: enable C locale coercion and UTF-8 Mode */ - if (config->utf8_mode < 0) { - config->utf8_mode = 1; - } + /* The C locale enables the C locale coercion (PEP 538) */ if (config->coerce_c_locale < 0) { config->coerce_c_locale = 1; } } +#ifndef MS_WINDOWS + const char *ctype_loc = setlocale(LC_CTYPE, NULL); + if (ctype_loc != NULL + && (strcmp(ctype_loc, "C") == 0 || strcmp(ctype_loc, "POSIX") == 0)) { + /* The C locale and the POSIX locale enable the UTF-8 Mode (PEP 540) */ + if (config->utf8_mode < 0) { + config->utf8_mode = 1; + } + } +#endif } |