commit ffd41d9f101e31973b8713e884c95118fceb6f59
author Antoine Pitrou <solipsis@pitrou.net> Tue Oct 04 09:23:04 2011 +0200
committer Antoine Pitrou <solipsis@pitrou.net> Tue Oct 04 09:23:04 2011 +0200
tree 3b549e20b5cf09244789f6e6f67a7dce2fad75b4
parent 1efb33a6823b94739e59d6e2fe92e8e703a7fc7d

Issue #7689: Allow pickling of dynamically created classes when their
metaclass is registered with copyreg.  Patch by Nicolas M. Thiéry and
Craig Citro.

Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 164d864..cb58349 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -3141,10 +3141,6 @@
         status = save_global(self, obj, NULL);
         goto done;
     }
-    else if (PyType_IsSubtype(type, &PyType_Type)) {
-        status = save_global(self, obj, NULL);
-        goto done;
-    }
 
     /* XXX: This part needs some unit tests. */
 
@@ -3163,6 +3159,10 @@
         Py_INCREF(obj);
         reduce_value = _Pickler_FastCall(self, reduce_func, obj);
     }
+    else if (PyType_IsSubtype(type, &PyType_Type)) {
+        status = save_global(self, obj, NULL);
+        goto done;
+    }
     else {
         static PyObject *reduce_str = NULL;
         static PyObject *reduce_ex_str = NULL;