From: Guido van Rossum Date: Sat, 24 Nov 2001 21:04:31 +0000 (+0000) Subject: _reduce(): X-Git-Tag: v2.2.1c1~707 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00fb0c954faeb582ab5a4b1776b774686509e3d3;p=python _reduce(): - Fix for SF bug #482752: __getstate__ & __setstate__ ignored (by Anon.) In fact, only __getstate__ isn't recognized. This fixes that. - Separately, the test for base.__flags__ & _HEAPTYPE raised an AttributeError exception when a classic class was amongst the bases. Fixed this with a hasattr() bandaid (classic classes never qualify as the "hard" base class anyway, which is what the code is trying to find). --- diff --git a/Lib/copy_reg.py b/Lib/copy_reg.py index d4697449a0..92cbd5345b 100644 --- a/Lib/copy_reg.py +++ b/Lib/copy_reg.py @@ -46,7 +46,7 @@ _HEAPTYPE = 1<<9 def _reduce(self): for base in self.__class__.__mro__: - if not base.__flags__ & _HEAPTYPE: + if hasattr(base, '__flags__') and not base.__flags__ & _HEAPTYPE: break else: base = object # not really reachable @@ -56,9 +56,14 @@ def _reduce(self): state = base(self) args = (self.__class__, base, state) try: - dict = self.__dict__ + getstate = self.__getstate__ except AttributeError: - dict = None + try: + dict = self.__dict__ + except AttributeError: + dict = None + else: + dict = getstate() if dict: return _reconstructor, args, dict else: