diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-04 07:23:04 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-04 07:23:04 (GMT) |
commit | ffd41d9f101e31973b8713e884c95118fceb6f59 (patch) | |
tree | 3b549e20b5cf09244789f6e6f67a7dce2fad75b4 /Lib/pickle.py | |
parent | 1efb33a6823b94739e59d6e2fe92e8e703a7fc7d (diff) | |
download | cpython-ffd41d9f101e31973b8713e884c95118fceb6f59.zip cpython-ffd41d9f101e31973b8713e884c95118fceb6f59.tar.gz cpython-ffd41d9f101e31973b8713e884c95118fceb6f59.tar.bz2 |
Issue #7689: Allow pickling of dynamically created classes when their
metaclass is registered with copyreg. Patch by Nicolas M. ThiƩry and
Craig Citro.
Diffstat (limited to 'Lib/pickle.py')
-rw-r--r-- | Lib/pickle.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index 32ae02b..c770ff8 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -299,20 +299,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: |