diff options
| -rw-r--r-- | Lib/argparse.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_argparse.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 0ef9f4e..63561f7 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1287,13 +1287,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): - raise ValueError('unknown action "%s"' % 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): - raise ValueError('%r is not callable' % type_func) + raise ValueError('%r is not callable' % (type_func,)) # raise an error if the metavar does not match the type if hasattr(self, "_get_formatter"): diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index e187653..5ecfdc7 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -4051,10 +4051,12 @@ class TestInvalidArgumentConstructors(TestCase): def test_invalid_type(self): self.assertValueError('--foo', type='int') + self.assertValueError('--foo', type=(int, float)) def test_invalid_action(self): self.assertValueError('-x', action='foo') self.assertValueError('foo', action='baz') + self.assertValueError('--foo', action=('store', 'append')) parser = argparse.ArgumentParser() try: parser.add_argument("--foo", action="store-true") @@ -188,6 +188,8 @@ Library - Issue #9026: Fix order of argparse sub-commands in help messages. +- Issue #9347: Fix formatting for tuples in argparse type= error messages. + Build ----- |