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/fileutils.c | |
| 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/fileutils.c')
| -rw-r--r-- | Python/fileutils.c | 12 |
1 files changed, 12 insertions, 0 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) */ |