summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:52:29 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 12:52:29 (GMT)
commitaabbda5354407cfe35097c7f17717a716a3d80c4 (patch)
treee15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/distutils
parentac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff)
parent5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff)
downloadcpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip
cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz
cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2
Merge 3.2
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/dist.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 69825f2..a702568 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -537,7 +537,7 @@ Common commands: (see '--help-commands' for more)
for (help_option, short, desc, func) in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option)):
help_option_found=1
- if hasattr(func, '__call__'):
+ if callable(func):
func()
else:
raise DistutilsClassError(