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.
This commit is contained in:
parent
e89607c0fc
commit
353933e712
|
@ -32,6 +32,14 @@ PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape(
|
|||
|
||||
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);
|
||||
|
||||
|
||||
PyAPI_FUNC(int) _Py_GetLocaleconvNumeric(
|
||||
struct lconv *lc,
|
||||
PyObject **decimal_point,
|
||||
|
|
|
@ -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) */
|
||||
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#include "Python-ast.h"
|
||||
#undef Yield /* undefine macro conflicting with <winbase.h> */
|
||||
#include "pycore_context.h"
|
||||
#include "pycore_fileutils.h"
|
||||
#include "pycore_hamt.h"
|
||||
#include "pycore_pathconfig.h"
|
||||
#include "pycore_pylifecycle.h"
|
||||
|
@ -394,6 +395,7 @@ done:
|
|||
char *
|
||||
_Py_SetLocaleFromEnv(int category)
|
||||
{
|
||||
char *res;
|
||||
#ifdef __ANDROID__
|
||||
const char *locale;
|
||||
const char **pvar;
|
||||
|
@ -440,10 +442,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;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue