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.
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 @@
#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 @@
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);