From 353933e712b6c7f7ba9a9a50bd5bd472db7c35d0 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 23 Nov 2018 13:08:26 +0100 Subject: bpo-34523: Fix C locale coercion on FreeBSD CURRENT (GH-10672) 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. --- Python/fileutils.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Python/fileutils.c') diff --git a/Python/fileutils.c b/Python/fileutils.c index 033c2ff71b..366bd007e1 100644 --- a/Python/fileutils.c +++ b/Python/fileutils.c @@ -231,6 +231,13 @@ _Py_GetForceASCII(void) } +void +_Py_ResetForceASCII(void) +{ + force_ascii = -1; +} + + static int encode_ascii(const wchar_t *text, char **str, size_t *error_pos, const char **reason, @@ -296,6 +303,12 @@ _Py_GetForceASCII(void) { return 0; } + +void +_Py_ResetForceASCII(void) +{ + /* nothing to do */ +} #endif /* !defined(__APPLE__) && !defined(__ANDROID__) && !defined(MS_WINDOWS) */ -- cgit v1.2.1