Merged revisions 79393 via svnmerge from
authorVictor Stinner <victor.stinner@haypocalc.com>
Thu, 25 Mar 2010 00:35:51 +0000 (00:35 +0000)
committerVictor Stinner <victor.stinner@haypocalc.com>
Thu, 25 Mar 2010 00:35:51 +0000 (00:35 +0000)
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
Misc/NEWS
Python/bltinmodule.c

index d7b9cd887434800ad334b6d52a58e47c7fd63687..73ef6f553b52eb72bc2d3bc2e96431ae06f3d3ed 100644 (file)
@@ -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():
index a39a7c8a6b9efc03e0a3efb1c1d143d208141214..9aa8766ee2552c714568d2a10e08ac01dfa109a4 100644 (file)
--- 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
index 069d7908c7896a03b337b71f75e84c943a26c6ed..10527c1428bafb92e44688d7e6467c20e7c23756 100644 (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);