mirror of
https://github.com/AdaCore/cpython.git
synced 2026-02-12 12:57:15 -08:00
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.
This commit is contained in:
@@ -1048,21 +1048,26 @@ PySys_ResetWarnOptions(void)
|
||||
}
|
||||
|
||||
void
|
||||
PySys_AddWarnOption(const wchar_t *s)
|
||||
PySys_AddWarnOptionUnicode(PyObject *unicode)
|
||||
{
|
||||
PyObject *str;
|
||||
|
||||
if (warnoptions == NULL || !PyList_Check(warnoptions)) {
|
||||
Py_XDECREF(warnoptions);
|
||||
warnoptions = PyList_New(0);
|
||||
if (warnoptions == NULL)
|
||||
return;
|
||||
}
|
||||
str = PyUnicode_FromWideChar(s, -1);
|
||||
if (str != NULL) {
|
||||
PyList_Append(warnoptions, str);
|
||||
Py_DECREF(str);
|
||||
}
|
||||
PyList_Append(warnoptions, unicode);
|
||||
}
|
||||
|
||||
void
|
||||
PySys_AddWarnOption(const wchar_t *s)
|
||||
{
|
||||
PyObject *unicode;
|
||||
unicode = PyUnicode_FromWideChar(s, -1);
|
||||
if (unicode == NULL)
|
||||
return;
|
||||
PySys_AddWarnOptionUnicode(unicode);
|
||||
Py_DECREF(unicode);
|
||||
}
|
||||
|
||||
int
|
||||
|
||||
Reference in New Issue
Block a user