mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 79393 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Victor Stinner 2010-03-25 00:35:51 +00:00
parent 2f927fc61b
commit d8805b2bb8
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_sys.py
View file

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

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 3.1.3?
Core and Builtins 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 #1583863: An str subclass can now override the __str__ method
Library Library

6
Python/bltinmodule.c
View file

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