summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS4
-rw-r--r--Objects/typeobject.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index dd75f61..86eac9f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.4 alpha 1?
Core and builtins
-----------------
+- Bug #966623. classes created with type() in an exec(, {}) don't
+ have a __module__, but code in typeobject assumed it would always
+ be there.
+
- Python no longer relies on the LC_NUMERIC locale setting to be
the "C" locale; as a result, it no longer tries to prevent changing
the LC_NUMERIC category.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 818572f..ee6e5d9 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -87,6 +87,10 @@ type_module(PyTypeObject *type, void *context)
if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
mod = PyDict_GetItemString(type->tp_dict, "__module__");
+ if (!mod) {
+ PyErr_Format(PyExc_AttributeError, "__module__");
+ return 0;
+ }
Py_XINCREF(mod);
return mod;
}