diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:45:05 (GMT) |
commit | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (patch) | |
tree | dcb2cf857c20dce837c82de7aea432ccf9a41355 /Lib/argparse.py | |
parent | f99e4b5dbef57e13dd603dcc0edd9b7318f08c28 (diff) | |
download | cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.zip cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.gz cpython-5d1155c08edf7f53eca804b2b6538636c2dfe711.tar.bz2 |
Closes #13258: Use callable() built-in in the standard library.
Diffstat (limited to 'Lib/argparse.py')
-rw-r--r-- | Lib/argparse.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 63561f7..2202b57 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -92,10 +92,6 @@ import textwrap as _textwrap from gettext import gettext as _, ngettext -def _callable(obj): - return hasattr(obj, '__call__') or hasattr(obj, '__bases__') - - SUPPRESS = '==SUPPRESS==' OPTIONAL = '?' @@ -1286,13 +1282,13 @@ class _ActionsContainer(object): # create the action object, and add it to the parser action_class = self._pop_action_class(kwargs) - if not _callable(action_class): + if not callable(action_class): raise ValueError('unknown action "%s"' % (action_class,)) action = action_class(**kwargs) # raise an error if the action type is not callable type_func = self._registry_get('type', action.type, action.type) - if not _callable(type_func): + if not callable(type_func): raise ValueError('%r is not callable' % (type_func,)) # raise an error if the metavar does not match the type @@ -2240,7 +2236,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer): def _get_value(self, action, arg_string): type_func = self._registry_get('type', action.type, action.type) - if not _callable(type_func): + if not callable(type_func): msg = _('%r is not callable') raise ArgumentError(action, msg % type_func) |