From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Fri, 11 Jun 2004 14:41:18 +0000 (+0000)
Subject: Fix for bug #966623 - classes created with type() in an exec(, {}) don't
X-Git-Tag: v2.4a1~207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ecdb250afb74f77b1148dea2bf08775f9de2ab3;p=python

Fix for bug #966623 - classes created with type() in an exec(, {}) don't
have a __module__. Test for this case.

Bugfix candidate, will backport.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index dd75f61e07..86eac9fa83 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 818572fa6f..ee6e5d988d 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;
 	}