Compromise on test in find_class(): a user-defined function is okay,

but a built-in function is not.

diff --git a/Lib/pickle.py b/Lib/pickle.py
index 682440d3aeed7b87d5f4e0e34b3aeabc5522cdfa..28f8f901d1237b9ef5d5eade95cb89db6789344a 100644 (file)
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -473,9 +473,7 @@ class Unpickler:
                              "Failed to import class %s from module %s" % \
                              (name, module)
                klass = env[name]
-               # if type(klass) != ClassType:
-               if (type(klass) is FunctionType or
-                   type(klass) is BuiltinFunctionType):
+               if type(klass) is BuiltinFunctionType:
                        raise SystemError, \
                         "Imported object %s from module %s is not a class" % \
                         (name, module)