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

Handle importing pkg.mod by executing

Browse source 
__import__('mod', {'__packaging__': 'pkg', level=1) w/o properly (and
thus not segfaulting).
This commit is contained in:
Brett Cannon 2012-04-14 21:50:00 -04:00
parent 59f9c3affc
commit 49f8d8b016
4 changed files with 276 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/import.c
View file

@ -3016,20 +3016,33 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
Py_DECREF(partition);
if (level == 0) {
final_mod = PyDict_GetItemWithError(interp->modules, front);
final_mod = PyDict_GetItem(interp->modules, front);
Py_DECREF(front);
Py_XINCREF(final_mod);
if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected", front);
}
else {
Py_INCREF(final_mod);
}
}
else {
Py_ssize_t cut_off = PyUnicode_GetLength(name) -
PyUnicode_GetLength(front);
Py_ssize_t abs_name_len = PyUnicode_GetLength(abs_name);
PyObject *to_return = PyUnicode_Substring(name, 0,
PyObject *to_return = PyUnicode_Substring(abs_name, 0,
abs_name_len - cut_off);
final_mod = PyDict_GetItem(interp->modules, to_return);
Py_INCREF(final_mod);
Py_DECREF(to_return);
if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected",
to_return);
}
else {
Py_INCREF(final_mod);
}
}
}
else {