diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-19 16:53:30 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-19 16:53:30 (GMT) |
| commit | 9ca9c25bcd9d4b771be6fee34a105546d1c8d666 (patch) | |
| tree | 1fcc4adff5bc504e451b760d87d30665668e14d7 /Modules/main.c | |
| parent | a5bf3f520c6d899b133b0526a551c279639a7851 (diff) | |
| download | cpython-9ca9c25bcd9d4b771be6fee34a105546d1c8d666.zip cpython-9ca9c25bcd9d4b771be6fee34a105546d1c8d666.tar.gz cpython-9ca9c25bcd9d4b771be6fee34a105546d1c8d666.tar.bz2 | |
Issue #8589: Decode PYTHONWARNINGS environment variable with the file system
encoding and surrogateespace error handler instead of the locale encoding to be
consistent with os.environ. Add PySys_AddWarnOptionUnicode() function.
Diffstat (limited to 'Modules/main.c')
| -rw-r--r-- | Modules/main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/main.c b/Modules/main.c index 92b971f..29f5fc8 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -425,7 +425,7 @@ Py_Main(int argc, wchar_t **argv) #else if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0') { char *buf, *oldloc; - wchar_t *warning; + PyObject *warning; /* settle for strtok here as there's no one standard C89 wcstok */ @@ -437,9 +437,10 @@ Py_Main(int argc, wchar_t **argv) oldloc = strdup(setlocale(LC_ALL, NULL)); setlocale(LC_ALL, ""); for (p = strtok(buf, ","); p != NULL; p = strtok(NULL, ",")) { - if ((warning = _Py_char2wchar(p)) != NULL) { - PySys_AddWarnOption(warning); - PyMem_Free(warning); + warning = PyUnicode_DecodeFSDefault(p); + if (warning != NULL) { + PySys_AddWarnOptionUnicode(warning); + Py_DECREF(warning); } } setlocale(LC_ALL, oldloc); |