diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
commit | aabbda5354407cfe35097c7f17717a716a3d80c4 (patch) | |
tree | e15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/shutil.py | |
parent | ac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff) | |
parent | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff) | |
download | cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2 |
Merge 3.2
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r-- | Lib/shutil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 2025ef8..d6b8565 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -525,7 +525,7 @@ def register_archive_format(name, function, extra_args=None, description=''): """ if extra_args is None: extra_args = [] - if not isinstance(function, collections.Callable): + if not callable(function): raise TypeError('The %s object is not callable' % function) if not isinstance(extra_args, (tuple, list)): raise TypeError('extra_args needs to be a sequence') @@ -618,7 +618,7 @@ def _check_unpack_options(extensions, function, extra_args): raise RegistryError(msg % (extension, existing_extensions[extension])) - if not isinstance(function, collections.Callable): + if not callable(function): raise TypeError('The registered function must be a callable') |