diff options
| -rw-r--r-- | Lib/pickle.py | 18 | ||||
| -rw-r--r-- | Lib/test/pickletester.py | 21 | ||||
| -rw-r--r-- | Misc/ACKS | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/_pickle.c | 8 |
5 files changed, 40 insertions, 13 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index 0aee77af77..a5c8328c13 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -297,20 +297,20 @@ class _Pickler: f(self, obj) # Call unbound method with explicit self return - # Check for a class with a custom metaclass; treat as regular class - try: - issc = issubclass(t, type) - except TypeError: # t is not a class (old Boost; see SF #502085) - issc = 0 - if issc: - self.save_global(obj) - return - # Check copyreg.dispatch_table reduce = dispatch_table.get(t) if reduce: rv = reduce(obj) else: + # Check for a class with a custom metaclass; treat as regular class + try: + issc = issubclass(t, type) + except TypeError: # t is not a class (old Boost; see SF #502085) + issc = False + if issc: + self.save_global(obj) + return + # Check for a __reduce_ex__ method, fall back to __reduce__ reduce = getattr(obj, "__reduce_ex__", None) if reduce: diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index d79aab7cef..ca464574bd 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -122,6 +122,19 @@ class metaclass(type): class use_metaclass(object, metaclass=metaclass): pass +class pickling_metaclass(type): + def __eq__(self, other): + return (type(self) == type(other) and + self.reduce_args == other.reduce_args) + + def __reduce__(self): + return (create_dynamic_class, self.reduce_args) + +def create_dynamic_class(name, bases): + result = pickling_metaclass(name, bases, dict()) + result.reduce_args = (name, bases) + return result + # DATA0 .. DATA2 are the pickles we expect under the various protocols, for # the object returned by create_data(). @@ -696,6 +709,14 @@ class AbstractPickleTests(unittest.TestCase): b = self.loads(s) self.assertEqual(a.__class__, b.__class__) + def test_dynamic_class(self): + a = create_dynamic_class("my_dynamic_class", (object,)) + copyreg.pickle(pickling_metaclass, pickling_metaclass.__reduce__) + for proto in protocols: + s = self.dumps(a, proto) + b = self.loads(s) + self.assertEqual(a, b) + def test_structseq(self): import time import os @@ -174,6 +174,7 @@ Anders Chrigström Tom Christiansen Vadim Chugunov David Cinege +Craig Citro Mike Clarkson Andrew Clegg Brad Clements @@ -941,6 +942,7 @@ Anatoly Techtonik Mikhail Terekhov Richard M. Tew Tobias Thelen +Nicolas M. Thiéry James Thomas Robin Thomas Stephen Thorne @@ -294,6 +294,10 @@ Core and Builtins Library ------- +- Issue #7689: Allow pickling of dynamically created classes when their + metaclass is registered with copyreg. Patch by Nicolas M. Thiéry and Craig + Citro. + - Issue #4147: minidom's toprettyxml no longer adds whitespace to text nodes. - Issue #13034: When decoding some SSL certificates, the subjectAltName diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 7bee1e169c..0b10009334 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -3134,10 +3134,6 @@ save(PicklerObject *self, PyObject *obj, int pers_save) 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. */ @@ -3156,6 +3152,10 @@ save(PicklerObject *self, PyObject *obj, int pers_save) 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; |