[Python-checkins] r82907 - python/branches/import_unicode/Modules/zipimport.c

[victor.stinner]

Author: victor.stinner
Date: Wed Jul 14 22:38:24 2010
New Revision: 82907

Log:
zipimport_get_source() uses PyUnicode_DecodeFSDefault()

Modified:
   python/branches/import_unicode/Modules/zipimport.c

Modified: python/branches/import_unicode/Modules/zipimport.c
==============================================================================
--- python/branches/import_unicode/Modules/zipimport.c	(original)
+++ python/branches/import_unicode/Modules/zipimport.c	Wed Jul 14 22:38:24 2010
@@ -504,7 +504,9 @@
     toc_entry = PyDict_GetItemString(self->files, path);
     if (toc_entry != NULL) {
         PyObject *bytes = get_data(self->archive, toc_entry);
-        PyObject *res = PyUnicode_FromString(PyBytes_AsString(bytes));
+        if (bytes == NULL)
+            return NULL;
+        PyObject *res = PyUnicode_DecodeFSDefault(PyBytes_AsString(bytes));
         Py_XDECREF(bytes);
         return res;
     }