Issue #8589: surrogateescape error handler is not available at startup
Py_Main() uses _Py_wchar2char() + PyUnicode_FromWideChar() instead of
PyUnicode_DecodeFSDefault(), because the PyCodec machinery is not ready yet.
diff --git a/Modules/main.c b/Modules/main.c
index dc8d84c..71fb6fa 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -488,7 +488,8 @@
#else
if ((p = Py_GETENV("PYTHONWARNINGS")) && *p != '\0') {
char *buf, *oldloc;
- PyObject *warning;
+ wchar_t *wchar;
+ PyObject *unicode;
/* settle for strtok here as there's no one standard
C89 wcstok */
@@ -500,11 +501,15 @@
oldloc = strdup(setlocale(LC_ALL, NULL));
setlocale(LC_ALL, "");
for (p = strtok(buf, ","); p != NULL; p = strtok(NULL, ",")) {
- warning = PyUnicode_DecodeFSDefault(p);
- if (warning != NULL) {
- PySys_AddWarnOptionUnicode(warning);
- Py_DECREF(warning);
- }
+ wchar = _Py_char2wchar(p);
+ if (wchar == NULL)
+ continue;
+ unicode = PyUnicode_FromWideChar(wchar, wcslen(wchar));
+ PyMem_Free(wchar);
+ if (unicode == NULL)
+ continue;
+ PySys_AddWarnOptionUnicode(unicode);
+ Py_DECREF(unicode);
}
setlocale(LC_ALL, oldloc);
free(oldloc);