Removed uses of dict.has_key() from distutils, and uses of
callable() from copy_reg.py, so the interpreter now starts up
without warnings when '-3' is given. More work like this needs to
be done in the rest of the stdlib.
diff --git a/Lib/copy_reg.py b/Lib/copy_reg.py
index 0dd94cf..db17150 100644
--- a/Lib/copy_reg.py
+++ b/Lib/copy_reg.py
@@ -15,7 +15,7 @@
if type(ob_type) is _ClassType:
raise TypeError("copy_reg is not intended for use with classes")
- if not callable(pickle_function):
+ if not hasattr(pickle_function, '__call__'):
raise TypeError("reduction functions must be callable")
dispatch_table[ob_type] = pickle_function
@@ -25,7 +25,7 @@
constructor(constructor_ob)
def constructor(object):
- if not callable(object):
+ if not hasattr(object, '__call__'):
raise TypeError("constructors must be callable")
# Example: provide pickling support for complex numbers.