From d8805b2bb8f5e25641153776c6a01c5653417ec9 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 25 Mar 2010 00:35:51 +0000 Subject: [PATCH] Merged revisions 79393 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r79393 | victor.stinner | 2010-03-25 01:30:28 +0100 (jeu., 25 mars 2010) | 3 lines Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding is unknown. ........ --- Lib/test/test_sys.py | 1 + Misc/NEWS | 3 +++ Python/bltinmodule.c | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index d7b9cd88743..73ef6f553b5 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -758,6 +758,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(): diff --git a/Misc/NEWS b/Misc/NEWS index a39a7c8a6b9..9aa8766ee25 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 3.1.3? 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 Library diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 069d7908c78..10527c1428b 100644 --- a/Python/bltinmodule.c +++ b/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);