traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_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).
This commit is contained in:
Guido van Rossum 2001-11-24 21:04:31 +00:00
parent 64585f6afb
commit 00fb0c954f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/copy_reg.py
View File

@ -46,7 +46,7 @@ _HEAPTYPE = 1<<9
def _reduce(self): def _reduce(self):
for base in self.__class__.__mro__: for base in self.__class__.__mro__:
if not base.__flags__ & _HEAPTYPE: if hasattr(base, '__flags__') and not base.__flags__ & _HEAPTYPE:
break break
else: else:
base = object # not really reachable base = object # not really reachable
@ -55,10 +55,15 @@ def _reduce(self):
else: else:
state = base(self) state = base(self)
args = (self.__class__, base, state) args = (self.__class__, base, state)
try:
getstate = self.__getstate__
except AttributeError:
try: try:
dict = self.__dict__ dict = self.__dict__
except AttributeError: except AttributeError:
dict = None dict = None
else:
dict = getstate()
if dict: if dict:
return _reconstructor, args, dict return _reconstructor, args, dict
else: else: