Commit 69ad491c authored by Victor Stinner's avatar Victor Stinner

initfsencoding(): get_codeset() failure is now a fatal error

Don't fallback to utf-8 anymore to avoid mojibake. I never got any error from
his function.
parent 96646438
......@@ -730,21 +730,14 @@ initfsencoding(void)
/* On Unix, set the file system encoding according to the
user's preference, if the CODESET names a well-known
Python codec, and Py_FileSystemDefaultEncoding isn't
initialized by other means. Also set the encoding of
stdin and stdout if these are terminals. */
initialized by other means. */
codeset = get_codeset();
if (codeset != NULL) {
Py_FileSystemDefaultEncoding = codeset;
Py_HasFileSystemDefaultEncoding = 0;
return;
} else {
fprintf(stderr, "Unable to get the locale encoding:\n");
PyErr_Print();
}
if (codeset == NULL)
Py_FatalError("Py_Initialize: Unable to get the locale encoding");
fprintf(stderr, "Unable to get the filesystem encoding: fallback to utf-8\n");
Py_FileSystemDefaultEncoding = "utf-8";
Py_HasFileSystemDefaultEncoding = 1;
Py_FileSystemDefaultEncoding = codeset;
Py_HasFileSystemDefaultEncoding = 0;
return;
}
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment