Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/argparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -2511,7 +2511,7 @@ def _get_values(self, action, arg_strings):
value = action.const
else:
value = action.default
if isinstance(value, str):
if isinstance(value, str) and value is not SUPPRESS:
value = self._get_value(action, value)
self._check_value(action, value)

Expand Down
20 changes: 13 additions & 7 deletions Lib/test/test_argparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -1556,18 +1556,24 @@ class TestDefaultSuppress(ParserTestCase):
"""Test actions with suppressed defaults"""

argument_signatures = [
Sig('foo', nargs='?', default=argparse.SUPPRESS),
Sig('bar', nargs='*', default=argparse.SUPPRESS),
Sig('foo', nargs='?', type=int, default=argparse.SUPPRESS),
Sig('bar', nargs='*', type=int, default=argparse.SUPPRESS),
Sig('--baz', action='store_true', default=argparse.SUPPRESS),
Sig('--qux', nargs='?', type=int, default=argparse.SUPPRESS),
Sig('--quux', nargs='*', type=int, default=argparse.SUPPRESS),
]
failures = ['-x']
failures = ['-x', 'a', '1 a']
successes = [
('', NS()),
('a', NS(foo='a')),
('a b', NS(foo='a', bar=['b'])),
('1', NS(foo=1)),
('1 2', NS(foo=1, bar=[2])),
('--baz', NS(baz=True)),
('a --baz', NS(foo='a', baz=True)),
('--baz a b', NS(foo='a', bar=['b'], baz=True)),
('1 --baz', NS(foo=1, baz=True)),
('--baz 1 2', NS(foo=1, bar=[2], baz=True)),
('--qux', NS(qux=None)),
('--qux 1', NS(qux=1)),
('--quux', NS(quux=[])),
('--quux 1 2', NS(quux=[1, 2])),
]


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :mod:`argparse` support of positional arguments with ``nargs='?'``,
``default=argparse.SUPPRESS`` and specified ``type``.
Loading