summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-08-28 11:51:20 (GMT)
committerGitHub <noreply@github.com>2018-08-28 11:51:20 (GMT)
commit65ef7425a32ee411d8047a4fad0fc6bb9ff733b1 (patch)
tree30c111f0aec78b0c2239df00346aa1a48580d652 /Python
parente3f20828f6b7f59baa2d25437176ee32ae7700b0 (diff)
downloadcpython-65ef7425a32ee411d8047a4fad0fc6bb9ff733b1.zip
cpython-65ef7425a32ee411d8047a4fad0fc6bb9ff733b1.tar.gz
cpython-65ef7425a32ee411d8047a4fad0fc6bb9ff733b1.tar.bz2
bpo-34527: POSIX locale enables the UTF-8 Mode (GH-8972) (GH-8974)
* The UTF-8 Mode is now also enabled by the "POSIX" locale, not only by the "C" locale. * On FreeBSD, Py_DecodeLocale() and Py_EncodeLocale() now also forces the ASCII encoding if the LC_CTYPE locale is "POSIX", not only if the LC_CTYPE locale is "C". * test_utf8_mode.test_cmd_line() checks also that the command line arguments are decoded from UTF-8 when the the UTF-8 Mode is enabled with POSIX locale or C locale. (cherry picked from commit 5cb258950ce9b69b1f65646431c464c0c17b1510)
Diffstat (limited to 'Python')
-rw-r--r--Python/fileutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/fileutils.c b/Python/fileutils.c
index 35869c8..b413f4e 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -128,7 +128,7 @@ check_force_ascii(void)
loc = setlocale(LC_CTYPE, NULL);
if (loc == NULL)
goto error;
- if (strcmp(loc, "C") != 0) {
+ if (strcmp(loc, "C") != 0 && strcmp(loc, "POSIX") != 0) {
/* the LC_CTYPE locale is different than C */
return 0;
}