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

Merge from 3.5 for issue #24492

Browse source
This commit is contained in:
Brett Cannon 2015-08-14 11:09:56 -07:00
commit d868376288
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Python/ceval.c
View file

@ -5085,19 +5085,24 @@ import_from(PyObject *v, PyObject *name)
sys.modules. */
PyErr_Clear();
pkgname = _PyObject_GetAttrId(v, &PyId___name__);
if (pkgname == NULL)
return NULL;
if (pkgname == NULL) {
goto error;
}
fullmodname = PyUnicode_FromFormat("%U.%U", pkgname, name);
Py_DECREF(pkgname);
if (fullmodname == NULL)
if (fullmodname == NULL) {
return NULL;
}
x = PyDict_GetItem(PyImport_GetModuleDict(), fullmodname);
if (x == NULL)
PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
else
Py_INCREF(x);
Py_DECREF(fullmodname);
if (x == NULL) {
goto error;
}
Py_INCREF(x);
return x;
error:
PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
return NULL;
}
static int