ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #24492: make sure that `from ... import ... raises an

Browse Source 
ImportError if __name__ is not defined on a package.

Thanks to Armin Rigo for the bug report and diagnosing the cause.
This commit is contained in:
Brett Cannon
2015-08-11 18:01:31 -07:00
parent bb8a52a8d3
commit 3008bc0f4a
3 changed files with 29 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