mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #8589: Decode PYTHONWARNINGS environment variable with the file system

Browse source 
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:
Victor Stinner 2010-05-19 16:53:30 +00:00
parent a5bf3f520c
commit 9ca9c25bcd
5 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/sysmodule.c
View file

@ -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