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

bpo-29546: Set 'path' on ImportError for `from ... import ...` (GH-91)

Browse source
This commit is contained in:
Matthias Bussonnier 2017-02-14 16:05:25 -08:00 • committed by Brett Cannon
parent 5ec08cea95
commit bc4bed4405
3 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/ceval.c
View file

@ -4995,7 +4995,7 @@ import_from(PyObject *v, PyObject *name)
{
PyObject *x;
_Py_IDENTIFIER(__name__);
PyObject *fullmodname, *pkgname;
PyObject *fullmodname, *pkgname, *pkgpath;
x = PyObject_GetAttr(v, name);
if (x != NULL || !PyErr_ExceptionMatches(PyExc_AttributeError))
@ -5021,7 +5021,15 @@ import_from(PyObject *v, PyObject *name)
Py_INCREF(x);
return x;
error:
PyErr_Format(PyExc_ImportError, "cannot import name %R", name);
pkgpath = PyModule_GetFilenameObject(v);
if (pkgpath == NULL || !PyUnicode_Check(pkgpath)) {
PyErr_Clear();
PyErr_SetImportError(PyUnicode_FromFormat("cannot import name %R", name), pkgname, NULL);
} else {
PyErr_SetImportError(PyUnicode_FromFormat("cannot import name %R", name), pkgname, pkgpath);
}
return NULL;
}