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

Issue8297: module attribute lookup failures now include module name in error message.

Browse source
This commit is contained in:
Ethan Furman 2014-04-24 14:47:47 -07:00
parent 7101cb07ef
commit 7b9ff0e6da
5 changed files with 52 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Objects/moduleobject.c
View file

@ -411,6 +411,31 @@ module_repr(PyModuleObject *m)
return PyObject_CallMethod(interp->importlib, "_module_repr", "O", m);
}
static PyObject*
module_getattr(PyObject *m, PyObject *name)
{
PyModuleObject *module;
PyObject *attr, *mod_name;
attr = PyObject_GenericGetAttr(m, name);
if (attr != NULL)
return attr;
PyErr_Clear();
module = (PyModuleObject*)m;
if (module->md_dict != NULL) {
mod_name = PyDict_GetItemString(module->md_dict, "__name__");
if (mod_name != NULL) {
PyErr_Format(PyExc_AttributeError,
"module '%U' has no attribute '%U'", mod_name, name);
return NULL;
}
else if (PyErr_Occurred())
PyErr_Clear();
}
PyErr_Format(PyExc_AttributeError,
"module has no attribute '%U'", name);
return NULL;
}
static int
module_traverse(PyModuleObject *m, visitproc visit, void *arg)
{
@ -464,7 +489,6 @@ static PyMethodDef module_methods[] = {
{0}
};
PyDoc_STRVAR(module_doc,
"module(name[, doc])\n\
\n\
@ -488,7 +512,7 @@ PyTypeObject PyModule_Type = {
0, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */
module_getattr, /* tp_getattro */
PyObject_GenericSetAttr, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC |