mirror of
https://github.com/python/cpython.git
synced 2025-07-28 13:44:43 +00:00
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.
This commit is contained in:
parent
b5e2684a1a
commit
8bc0965adf
17 changed files with 44 additions and 39 deletions
|
@ -15,7 +15,7 @@ def pickle(ob_type, pickle_function, constructor_ob=None):
|
|||
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 @@ def pickle(ob_type, pickle_function, constructor_ob=None):
|
|||
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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue