Merge 3.2: sys.getfilesystemencoding() raises a RuntimeError if

initfsencoding() was not called yet: detect bootstrap (startup) issues earlier.
This commit is contained in:
Victor Stinner
2011-03-31 13:40:14 +02:00
2 changed files with 6 additions and 2 deletions

View File

@@ -259,8 +259,9 @@ sys_getfilesystemencoding(PyObject *self)
{
if (Py_FileSystemDefaultEncoding)
return PyUnicode_FromString(Py_FileSystemDefaultEncoding);
Py_INCREF(Py_None);
return Py_None;
PyErr_SetString(PyExc_RuntimeError,
"filesystem encoding is not initialized");
return NULL;
}
PyDoc_STRVAR(getfilesystemencoding_doc,