sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not

Victor Stinner · Victor Stinner · commit 27181ac778fd · 2011-03-31T13:39:03.000+02:00
called yet: detect bootstrap (startup) issues earlier.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -49,6 +49,9 @@ Core and Builtins
 Library
 -------
 
+- sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not
+  called yet: detect bootstrap (startup) issues earlier.
+
 - Issue #11618: Fix the timeout logic in threading.Lock.acquire() under Windows.
 
 - Issue #11256: Fix inspect.getcallargs on functions that take only keyword
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,9 @@ sys_getfilesystemencoding(PyObject *self)`
`259`	`259`	`{`
`260`	`260`	`if (Py_FileSystemDefaultEncoding)`
`261`	`261`	`return PyUnicode_FromString(Py_FileSystemDefaultEncoding);`
`262`		`- Py_INCREF(Py_None);`
`263`		`- return Py_None;`
	`262`	`+ PyErr_SetString(PyExc_RuntimeError,`
	`263`	`+ "filesystem encoding is not initialized");`
	`264`	`+ return NULL;`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`PyDoc_STRVAR(getfilesystemencoding_doc,`