diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-10 11:34:13 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-10 11:34:13 (GMT) |
| commit | fc43511867bfee131a3bfb18969ad02a1bb44a07 (patch) | |
| tree | 2f07faf1728b809886d9e2616baaec002ff9cea4 | |
| parent | 731b1b12b8de92b5da8bcdb5ba686f1d3a83662a (diff) | |
| download | cpython-fc43511867bfee131a3bfb18969ad02a1bb44a07.zip cpython-fc43511867bfee131a3bfb18969ad02a1bb44a07.tar.gz cpython-fc43511867bfee131a3bfb18969ad02a1bb44a07.tar.bz2 | |
Issue #25339: PYTHONIOENCODING now has priority over locale in setting the
error handler for stdin and stdout.
| -rw-r--r-- | Lib/test/test_sys.py | 27 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 19 |
3 files changed, 35 insertions, 14 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 6046671..2aa16fc 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -691,8 +691,10 @@ class SysModuleTest(unittest.TestCase): args = [sys.executable, "-c", code] if isolated: args.append("-I") - elif encoding: + if encoding is not None: env['PYTHONIOENCODING'] = encoding + else: + env.pop('PYTHONIOENCODING', None) p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, @@ -709,15 +711,32 @@ class SysModuleTest(unittest.TestCase): 'stderr: backslashreplace\n') # replace the default error handler - out = self.c_locale_get_error_handler(encoding=':strict') + out = self.c_locale_get_error_handler(encoding=':ignore') self.assertEqual(out, - 'stdin: strict\n' - 'stdout: strict\n' + 'stdin: ignore\n' + 'stdout: ignore\n' 'stderr: backslashreplace\n') # force the encoding out = self.c_locale_get_error_handler(encoding='iso8859-1') self.assertEqual(out, + 'stdin: strict\n' + 'stdout: strict\n' + 'stderr: backslashreplace\n') + out = self.c_locale_get_error_handler(encoding='iso8859-1:') + self.assertEqual(out, + 'stdin: strict\n' + 'stdout: strict\n' + 'stderr: backslashreplace\n') + + # have no any effect + out = self.c_locale_get_error_handler(encoding=':') + self.assertEqual(out, + 'stdin: surrogateescape\n' + 'stdout: surrogateescape\n' + 'stderr: backslashreplace\n') + out = self.c_locale_get_error_handler(encoding='') + self.assertEqual(out, 'stdin: surrogateescape\n' 'stdout: surrogateescape\n' 'stderr: backslashreplace\n') @@ -10,6 +10,9 @@ Release date: tba Core and Builtins ----------------- +- Issue #25339: PYTHONIOENCODING now has priority over locale in setting the + error handler for stdin and stdout. + - Issue #26494: Fixed crash on iterating exhausting iterators. Affected classes are generic sequence iterators, iterators of str, bytes, bytearray, list, tuple, set, frozenset, dict, OrderedDict, corresponding diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 35ca88f..ce52990 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1135,15 +1135,6 @@ initstdio(void) encoding = _Py_StandardStreamEncoding; errors = _Py_StandardStreamErrors; if (!encoding || !errors) { - if (!errors) { - /* When the LC_CTYPE locale is the POSIX locale ("C locale"), - stdin and stdout use the surrogateescape error handler by - default, instead of the strict error handler. */ - char *loc = setlocale(LC_CTYPE, NULL); - if (loc != NULL && strcmp(loc, "C") == 0) - errors = "surrogateescape"; - } - pythonioencoding = Py_GETENV("PYTHONIOENCODING"); if (pythonioencoding) { char *err; @@ -1156,7 +1147,7 @@ initstdio(void) if (err) { *err = '\0'; err++; - if (*err && !_Py_StandardStreamErrors) { + if (*err && !errors) { errors = err; } } @@ -1164,6 +1155,14 @@ initstdio(void) encoding = pythonioencoding; } } + if (!errors && !(pythonioencoding && *pythonioencoding)) { + /* When the LC_CTYPE locale is the POSIX locale ("C locale"), + stdin and stdout use the surrogateescape error handler by + default, instead of the strict error handler. */ + char *loc = setlocale(LC_CTYPE, NULL); + if (loc != NULL && strcmp(loc, "C") == 0) + errors = "surrogateescape"; + } } /* Set sys.stdin */ |