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

diff --git a/Lib/pickle.py b/Lib/pickle.py
index 7e8e6656683ef10f73e1b14446ff3c5e33b0c662..21ea21536fa664c099b070095136b7588b1a7760 100644 (file)
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -164,7 +164,11 @@ class Pickler:
         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