Mercurial > cpython-lru_cache-weakref
diff Python/sysmodule.c @ 61751:b7f71f60437b
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.
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Wed, 19 May 2010 16:53:30 +0000 |
| parents | cab14be0ada1 |
| children | 795762b5e0d6 |
line wrap: on
line diff
--- a/Python/sysmodule.c Wed May 19 16:09:41 2010 +0000 +++ b/Python/sysmodule.c Wed May 19 16:53:30 2010 +0000 @@ -1048,21 +1048,26 @@ } 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