diff options
| -rw-r--r-- | Include/fileutils.h | 7 | ||||
| -rw-r--r-- | Python/fileutils.c | 12 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 11 |
3 files changed, 26 insertions, 4 deletions
diff --git a/Include/fileutils.h b/Include/fileutils.h index d75189a95c..419d49ab75 100644 --- a/Include/fileutils.h +++ b/Include/fileutils.h @@ -185,6 +185,13 @@ PyAPI_FUNC(int) _Py_GetLocaleconvNumeric( #ifdef Py_BUILD_CORE PyAPI_FUNC(int) _Py_GetForceASCII(void); + +/* Reset "force ASCII" mode (if it was initialized). + + This function should be called when Python changes the LC_CTYPE locale, + so the "force ASCII" mode can be detected again on the new locale + encoding. */ +PyAPI_FUNC(void) _Py_ResetForceASCII(void); #endif #ifdef __cplusplus 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; } |