In whichmodule(), use __module__ if set.

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index b5fddd0e7ebc985bb03b28d362f2927b448ad846..6021a03da42bba656d7ac9bc28a1a2288744197a 100644 (file)
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -632,6 +632,10 @@ whichmodule(PyObject *global, PyObject *global_name) {
     PyObject *module = 0, *modules_dict = 0,
         *global_name_attr = 0, *name = 0;
 
+    module = PyObject_GetAttrString(global, "__module__");
+    if (module) return module;
+    PyErr_Clear();
+
     if ((module = PyDict_GetItem(class_map, global))) {
         Py_INCREF(module);
         return module;