commit aabbda5354407cfe35097c7f17717a716a3d80c4
author Florent Xicluna <florent.xicluna@gmail.com> Fri Oct 28 14:52:29 2011 +0200
committer Florent Xicluna <florent.xicluna@gmail.com> Fri Oct 28 14:52:29 2011 +0200
tree e15e7fe42975e08e567879ec8a949d4986ca4493
parent ac73b0c95e352563ecf0a4643b30215b9bdee1a5
parent 5d1155c08edf7f53eca804b2b6538636c2dfe711

Merge 3.2

Lib/packaging/dist.py

diff --git a/Lib/packaging/dist.py b/Lib/packaging/dist.py
index 3019b7c..4027d23 100644
--- a/Lib/packaging/dist.py
+++ b/Lib/packaging/dist.py
@@ -409,7 +409,7 @@
             for help_option, short, desc, func in cmd_class.help_options:
                 if hasattr(opts, help_option.replace('-', '_')):
                     help_option_found = True
-                    if hasattr(func, '__call__'):
+                    if callable(func):
                         func()
                     else:
                         raise PackagingClassError(
@@ -733,7 +733,7 @@
             else:
                 hook_obj = hook
 
-            if not hasattr(hook_obj, '__call__'):
+            if not callable(hook_obj):
                 raise PackagingOptionError('hook %r is not callable' % hook)
 
             logger.info('running %s %s for command %s',