mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge heads

Browse source
This commit is contained in:
Benjamin Peterson 2012-04-26 00:27:06 -04:00
commit 9fa47ebafe
15 changed files with 3096 additions and 3216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/import.c
View file

@ -268,8 +268,8 @@ _PyImportZip_Init(void)
"# can't import zipimport.zipimporter\n");
}
else {
/* sys.path_hooks.append(zipimporter) */
err = PyList_Append(path_hooks, zipimporter);
/* sys.path_hooks.insert(0, zipimporter) */
err = PyList_Insert(path_hooks, 0, zipimporter);
Py_DECREF(zipimporter);
if (err < 0) {
goto error;

6084
Python/importlib.h
View file

File diff suppressed because it is too large Load diff

2
Python/pythonrun.c
View file

@ -229,7 +229,7 @@ import_init(PyInterpreterState *interp, PyObject *sysmod)
Py_FatalError("Py_Initialize: can't save _imp to sys.modules");
}
value = PyObject_CallMethod(importlib, "_setup", "OO", sysmod, impmod);
value = PyObject_CallMethod(importlib, "_install", "OO", sysmod, impmod);
if (value == NULL) {
PyErr_Print();
Py_FatalError("Py_Initialize: importlib install failed");