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/packaging | |
| 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/packaging')
| -rw-r--r-- | Lib/packaging/dist.py | 4 | ||||
| -rw-r--r-- | Lib/packaging/run.py | 2 |
2 files changed, 3 insertions, 3 deletions
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 @@ Common commands: (see '--help-commands' for more) 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 @@ Common commands: (see '--help-commands' for more) 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', diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py index 59ad6ee..671a4bf 100644 --- a/Lib/packaging/run.py +++ b/Lib/packaging/run.py @@ -500,7 +500,7 @@ class Dispatcher: 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( |