diff options
author | Victor Stinner <vstinner@redhat.com> | 2018-11-23 13:37:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-23 13:37:42 +0100 |
commit | f6e323ce322cf54b1a9e9252b13f93ebc28b5c24 (patch) | |
tree | 929a617da14329ea9edd784256f7d77f75955d0e /Python | |
parent | 95036ea25d47f0081bda2ba96ea327f3375cb6a4 (diff) | |
download | cpython-git-f6e323ce322cf54b1a9e9252b13f93ebc28b5c24.tar.gz |
bpo-34523: Fix C locale coercion on FreeBSD CURRENT (GH-10672) (GH-10673)
bpo-34523, bpo-35290: C locale coercion now resets the Python
internal "force ASCII" mode. This change fix the filesystem encoding
on FreeBSD CURRENT, which has a new "C.UTF-8" locale, when
the UTF-8 mode is disabled.
Add _Py_ResetForceASCII(): _Py_SetLocaleFromEnv() now calls it.
(cherry picked from commit 353933e712b6c7f7ba9a9a50bd5bd472db7c35d0)
Diffstat (limited to 'Python')
-rw-r--r-- | Python/fileutils.c | 12 | ||||
-rw-r--r-- | Python/pylifecycle.c | 11 |
2 files changed, 19 insertions, 4 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c index b77e490ce2..5e71d37526 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -191,6 +191,12 @@ _Py_GetForceASCII(void) } +void +_Py_ResetForceASCII(void) +{ + force_ascii = -1; +} + static int encode_ascii(const wchar_t *text, char **str, @@ -252,6 +258,12 @@ _Py_GetForceASCII(void) { return 0; } + +void +_Py_ResetForceASCII(void) +{ + /* nothing to do */ +} #endif /* !defined(__APPLE__) && !defined(__ANDROID__) && !defined(MS_WINDOWS) */ diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 86f95de833..4b08c9c2b2 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -523,6 +523,7 @@ done: char * _Py_SetLocaleFromEnv(int category) { + char *res; #ifdef __ANDROID__ const char *locale; const char **pvar; @@ -569,10 +570,12 @@ _Py_SetLocaleFromEnv(int category) } } #endif - return setlocale(category, utf8_locale); -#else /* __ANDROID__ */ - return setlocale(category, ""); -#endif /* __ANDROID__ */ + res = setlocale(category, utf8_locale); +#else /* !defined(__ANDROID__) */ + res = setlocale(category, ""); +#endif + _Py_ResetForceASCII(); + return res; } |