Issue #25758: Prevents zipimport from unnecessarily encoding a filename (patch by Eryk Sun)

This commit is contained in:
Steve Dower 2016-09-09 17:27:33 -07:00
parent 347dc95cd3
commit 8dcc48ee3b
3 changed files with 8 additions and 11 deletions

View File

@ -596,7 +596,7 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
z.writestr(zinfo, test_src)
z.close()
try:
zipimport.zipimporter(filename)
zipimport.zipimporter(filename).load_module(TESTMOD)
finally:
os.remove(filename)

View File

@ -10,6 +10,9 @@ Release date: TBA
Core and Builtins
-----------------
- Issue #25758: Prevents zipimport from unnecessarily encoding a filename
(patch by Eryk Sun)
- Issue #27812: Properly clear out a generator's frame's backreference to the
generator to prevent crashes in frame.clear().

View File

@ -1362,22 +1362,16 @@ normalize_line_endings(PyObject *source)
static PyObject *
compile_source(PyObject *pathname, PyObject *source)
{
PyObject *code, *fixed_source, *pathbytes;
pathbytes = PyUnicode_EncodeFSDefault(pathname);
if (pathbytes == NULL)
return NULL;
PyObject *code, *fixed_source;
fixed_source = normalize_line_endings(source);
if (fixed_source == NULL) {
Py_DECREF(pathbytes);
return NULL;
}
code = Py_CompileString(PyBytes_AsString(fixed_source),
PyBytes_AsString(pathbytes),
Py_file_input);
Py_DECREF(pathbytes);
code = Py_CompileStringObject(PyBytes_AsString(fixed_source),
pathname, Py_file_input, NULL, 1);
Py_DECREF(fixed_source);
return code;
}