Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding

is unknown.
This commit is contained in:
Victor Stinner 2010-03-25 00:30:28 +00:00
parent cd4ec0e273
commit 120c21227a
3 changed files with 9 additions and 1 deletions

View file

@ -29,7 +29,7 @@ int Py_HasFileSystemDefaultEncoding = 0;
int
_Py_SetFileSystemEncoding(PyObject *s)
{
PyObject *defenc;
PyObject *defenc, *codec;
if (!PyUnicode_Check(s)) {
PyErr_BadInternalCall();
return -1;
@ -37,6 +37,10 @@ _Py_SetFileSystemEncoding(PyObject *s)
defenc = _PyUnicode_AsDefaultEncodedString(s, NULL);
if (!defenc)
return -1;
codec = _PyCodec_Lookup(PyBytes_AsString(defenc));
if (codec == NULL)
return -1;
Py_DECREF(codec);
if (!Py_HasFileSystemDefaultEncoding && Py_FileSystemDefaultEncoding)
/* A file system encoding was set at run-time */
free((char*)Py_FileSystemDefaultEncoding);