diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pylifecycle.c | 19 |
1 files changed, 9 insertions, 10 deletions
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 */ |