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

is unknown.

Lib/test/test_sys.py

@@ -799,6 +799,7 @@ class SizeofTest(unittest.TestCase):
         old = sys.getfilesystemencoding()
         sys.setfilesystemencoding("iso-8859-1")
         self.assertEqual(sys.getfilesystemencoding(), "iso-8859-1")
+        self.assertRaises(LookupError, sys.setfilesystemencoding, "xxx")
         sys.setfilesystemencoding(old)
 
 def test_main():

Misc/NEWS

@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding
+  is unknown
+
 - Issue #1583863: An str subclass can now override the __str__ method
 
 - Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with

Python/bltinmodule.c

@@ -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);