Commits

Anonymous committed 470e9da

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).

  • Participants
  • Parent commits b59ad4b
  • Branches 2.2

Comments (0)

Files changed (1)

File Lib/pickle.py

         try:
             f = self.dispatch[t]
         except KeyError:
-            if issubclass(t, TypeType):
+            try:
+                issc = issubclass(t, TypeType)
+            except TypeError: # t is not a class
+                issc = 0
+            if issc:
                 self.save_global(object)
                 return