Merge 3.2

This commit is contained in:
Florent Xicluna 2011-10-28 14:52:29 +02:00
commit aabbda5354
27 changed files with 51 additions and 54 deletions

View file

@ -708,7 +708,7 @@ class Option:
def _check_callback(self):
if self.action == "callback":
if not hasattr(self.callback, '__call__'):
if not callable(self.callback):
raise OptionError(
"callback not callable: %r" % self.callback, self)
if (self.callback_args is not None and