[Python-checkins] cpython: Issue8297: module attribute lookup failures now include module name in error

Thu Apr 24 23:48:01 CEST 2014

http://hg.python.org/cpython/rev/d84a69b7ba72
changeset: 90453:d84a69b7ba72
user: Ethan Furman <ethan at stoneleaf.us>
date: Thu Apr 24 14:47:47 2014 -0700
summary:
 Issue8297: module attribute lookup failures now include module name in error message.
files:
 Lib/test/test_doctest.py | 4 +-
 Lib/test/test_module.py | 16 +++++++++++
 Lib/unittest/test/test_loader.py | 10 +++---
 Misc/NEWS | 3 ++
 Objects/moduleobject.c | 28 ++++++++++++++++++-
 5 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -2171,7 +2171,7 @@
 >>> test.test_doctest.sillySetup
 Traceback (most recent call last):
 ...
- AttributeError: 'module' object has no attribute 'sillySetup'
+ AttributeError: module 'test.test_doctest' has no attribute 'sillySetup'
 
 The setUp and tearDown funtions are passed test objects. Here
 we'll use the setUp function to supply the missing variable y:
@@ -2317,7 +2317,7 @@
 >>> test.test_doctest.sillySetup
 Traceback (most recent call last):
 ...
- AttributeError: 'module' object has no attribute 'sillySetup'
+ AttributeError: module 'test.test_doctest' has no attribute 'sillySetup'
 
 The setUp and tearDown funtions are passed test objects.
 Here, we'll use a setUp function to set the favorite color in
diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py
--- a/Lib/test/test_module.py
+++ b/Lib/test/test_module.py
@@ -30,6 +30,22 @@
 pass
 self.assertEqual(foo.__doc__, ModuleType.__doc__)
 
+ def test_unintialized_missing_getattr(self):
+ # Issue 8297
+ # test the text in the AttributeError of an uninitialized module
+ foo = ModuleType.__new__(ModuleType)
+ self.assertRaisesRegex(
+ AttributeError, "module has no attribute 'not_here'",
+ getattr, foo, "not_here")
+
+ def test_missing_getattr(self):
+ # Issue 8297
+ # test the text in the AttributeError
+ foo = ModuleType("foo")
+ self.assertRaisesRegex(
+ AttributeError, "module 'foo' has no attribute 'not_here'",
+ getattr, foo, "not_here")
+
 def test_no_docstring(self):
 # Regularly initialized module, no docstring
 foo = ModuleType("foo")
diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py
--- a/Lib/unittest/test/test_loader.py
+++ b/Lib/unittest/test/test_loader.py
@@ -255,7 +255,7 @@
 try:
 loader.loadTestsFromName('unittest.sdasfasfasdf')
 except AttributeError as e:
- self.assertEqual(str(e), "'module' object has no attribute 'sdasfasfasdf'")
+ self.assertEqual(str(e), "module 'unittest' has no attribute 'sdasfasfasdf'")
 else:
 self.fail("TestLoader.loadTestsFromName failed to raise AttributeError")
 
@@ -272,7 +272,7 @@
 try:
 loader.loadTestsFromName('sdasfasfasdf', unittest)
 except AttributeError as e:
- self.assertEqual(str(e), "'module' object has no attribute 'sdasfasfasdf'")
+ self.assertEqual(str(e), "module 'unittest' has no attribute 'sdasfasfasdf'")
 else:
 self.fail("TestLoader.loadTestsFromName failed to raise AttributeError")
 
@@ -635,7 +635,7 @@
 try:
 loader.loadTestsFromNames(['unittest.sdasfasfasdf', 'unittest'])
 except AttributeError as e:
- self.assertEqual(str(e), "'module' object has no attribute 'sdasfasfasdf'")
+ self.assertEqual(str(e), "module 'unittest' has no attribute 'sdasfasfasdf'")
 else:
 self.fail("TestLoader.loadTestsFromNames failed to raise AttributeError")
 
@@ -654,7 +654,7 @@
 try:
 loader.loadTestsFromNames(['sdasfasfasdf'], unittest)
 except AttributeError as e:
- self.assertEqual(str(e), "'module' object has no attribute 'sdasfasfasdf'")
+ self.assertEqual(str(e), "module 'unittest' has no attribute 'sdasfasfasdf'")
 else:
 self.fail("TestLoader.loadTestsFromName failed to raise AttributeError")
 
@@ -673,7 +673,7 @@
 try:
 loader.loadTestsFromNames(['TestCase', 'sdasfasfasdf'], unittest)
 except AttributeError as e:
- self.assertEqual(str(e), "'module' object has no attribute 'sdasfasfasdf'")
+ self.assertEqual(str(e), "module 'unittest' has no attribute 'sdasfasfasdf'")
 else:
 self.fail("TestLoader.loadTestsFromName failed to raise AttributeError")
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@
 - Issue #20637: Key-sharing now also works for instance dictionaries of
 subclasses. Patch by Peter Ingebretson.
 
+- Issue #8297: Attributes missing from modules now include the module name
+ in the error text. Original patch by ysj.ray.
+
 - Issue #19995: %c, %o, %x, and %X now raise TypeError on non-integer input.
 
 - Issue #12546: Allow \x00 to be used as a fill character when using str, int,
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -411,6 +411,31 @@
 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 @@
 {0}
 };
 
-
 PyDoc_STRVAR(module_doc,
 "module(name[, doc])\n\
 \n\
@@ -488,7 +512,7 @@
 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 |
-- 
Repository URL: http://hg.python.org/cpython
