Mailing List Archive

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv19064

Modified Files:
Tag: release22-maint
pickle.py
Log Message:
It made it.

backport gvanrossum's checkin of
revision 1.58 of pickle.py

Fix for SF 502085.
Don't die when issubclass(t, TypeType) fails.

Bugfix candidate (but I think it's too late for 2.2.1).


Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.56
retrieving revision 1.56.4.1
diff -C2 -d -r1.56 -r1.56.4.1
*** pickle.py 19 Dec 2001 16:55:02 -0000 1.56
--- pickle.py 26 Mar 2002 09:57:13 -0000 1.56.4.1
***************
*** 164,168 ****
f = self.dispatch[t]
except KeyError:
! if issubclass(t, TypeType):
self.save_global(object)
return
--- 164,172 ----
f = self.dispatch[t]
except KeyError:
! try:
! issc = issubclass(t, TypeType)
! except TypeError: # t is not a class
! issc = 0
! if issc:
self.save_global(object)
return