mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
[3.13] gh-63143: Fix parsing mutually exclusive arguments in argparse (GH-124307) (GH-124418)
Arguments with the value identical to the default value (e.g. booleans,
small integers, empty or 1-character strings) are no longer considered
"not present".
(cherry picked from commit 3094cd17b0
)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
parent
63870162f4
commit
167d8d2f07
3 changed files with 120 additions and 9 deletions
|
@ -2900,26 +2900,30 @@ class MEMixin(object):
|
|||
parse_args = self.get_parser(required=False).parse_args
|
||||
error = ArgumentParserError
|
||||
for args_string in self.failures:
|
||||
self.assertRaises(error, parse_args, args_string.split())
|
||||
with self.subTest(args=args_string):
|
||||
self.assertRaises(error, parse_args, args_string.split())
|
||||
|
||||
def test_failures_when_required(self):
|
||||
parse_args = self.get_parser(required=True).parse_args
|
||||
error = ArgumentParserError
|
||||
for args_string in self.failures + ['']:
|
||||
self.assertRaises(error, parse_args, args_string.split())
|
||||
with self.subTest(args=args_string):
|
||||
self.assertRaises(error, parse_args, args_string.split())
|
||||
|
||||
def test_successes_when_not_required(self):
|
||||
parse_args = self.get_parser(required=False).parse_args
|
||||
successes = self.successes + self.successes_when_not_required
|
||||
for args_string, expected_ns in successes:
|
||||
actual_ns = parse_args(args_string.split())
|
||||
self.assertEqual(actual_ns, expected_ns)
|
||||
with self.subTest(args=args_string):
|
||||
actual_ns = parse_args(args_string.split())
|
||||
self.assertEqual(actual_ns, expected_ns)
|
||||
|
||||
def test_successes_when_required(self):
|
||||
parse_args = self.get_parser(required=True).parse_args
|
||||
for args_string, expected_ns in self.successes:
|
||||
actual_ns = parse_args(args_string.split())
|
||||
self.assertEqual(actual_ns, expected_ns)
|
||||
with self.subTest(args=args_string):
|
||||
actual_ns = parse_args(args_string.split())
|
||||
self.assertEqual(actual_ns, expected_ns)
|
||||
|
||||
def test_usage_when_not_required(self):
|
||||
format_usage = self.get_parser(required=False).format_usage
|
||||
|
@ -3306,6 +3310,111 @@ class TestMutuallyExclusiveNested(MEMixin, TestCase):
|
|||
test_successes_when_not_required = None
|
||||
test_successes_when_required = None
|
||||
|
||||
|
||||
class TestMutuallyExclusiveOptionalOptional(MEMixin, TestCase):
|
||||
def get_parser(self, required=None):
|
||||
parser = ErrorRaisingArgumentParser(prog='PROG')
|
||||
group = parser.add_mutually_exclusive_group(required=required)
|
||||
group.add_argument('--foo')
|
||||
group.add_argument('--bar', nargs='?')
|
||||
return parser
|
||||
|
||||
failures = [
|
||||
'--foo X --bar Y',
|
||||
'--foo X --bar',
|
||||
]
|
||||
successes = [
|
||||
('--foo X', NS(foo='X', bar=None)),
|
||||
('--bar X', NS(foo=None, bar='X')),
|
||||
('--bar', NS(foo=None, bar=None)),
|
||||
]
|
||||
successes_when_not_required = [
|
||||
('', NS(foo=None, bar=None)),
|
||||
]
|
||||
usage_when_required = '''\
|
||||
usage: PROG [-h] (--foo FOO | --bar [BAR])
|
||||
'''
|
||||
usage_when_not_required = '''\
|
||||
usage: PROG [-h] [--foo FOO | --bar [BAR]]
|
||||
'''
|
||||
help = '''\
|
||||
|
||||
options:
|
||||
-h, --help show this help message and exit
|
||||
--foo FOO
|
||||
--bar [BAR]
|
||||
'''
|
||||
|
||||
|
||||
class TestMutuallyExclusiveOptionalWithDefault(MEMixin, TestCase):
|
||||
def get_parser(self, required=None):
|
||||
parser = ErrorRaisingArgumentParser(prog='PROG')
|
||||
group = parser.add_mutually_exclusive_group(required=required)
|
||||
group.add_argument('--foo')
|
||||
group.add_argument('--bar', type=bool, default=True)
|
||||
return parser
|
||||
|
||||
failures = [
|
||||
'--foo X --bar Y',
|
||||
'--foo X --bar=',
|
||||
]
|
||||
successes = [
|
||||
('--foo X', NS(foo='X', bar=True)),
|
||||
('--bar X', NS(foo=None, bar=True)),
|
||||
('--bar=', NS(foo=None, bar=False)),
|
||||
]
|
||||
successes_when_not_required = [
|
||||
('', NS(foo=None, bar=True)),
|
||||
]
|
||||
usage_when_required = '''\
|
||||
usage: PROG [-h] (--foo FOO | --bar BAR)
|
||||
'''
|
||||
usage_when_not_required = '''\
|
||||
usage: PROG [-h] [--foo FOO | --bar BAR]
|
||||
'''
|
||||
help = '''\
|
||||
|
||||
options:
|
||||
-h, --help show this help message and exit
|
||||
--foo FOO
|
||||
--bar BAR
|
||||
'''
|
||||
|
||||
|
||||
class TestMutuallyExclusivePositionalWithDefault(MEMixin, TestCase):
|
||||
def get_parser(self, required=None):
|
||||
parser = ErrorRaisingArgumentParser(prog='PROG')
|
||||
group = parser.add_mutually_exclusive_group(required=required)
|
||||
group.add_argument('--foo')
|
||||
group.add_argument('bar', nargs='?', type=bool, default=True)
|
||||
return parser
|
||||
|
||||
failures = [
|
||||
'--foo X Y',
|
||||
]
|
||||
successes = [
|
||||
('--foo X', NS(foo='X', bar=True)),
|
||||
('X', NS(foo=None, bar=True)),
|
||||
]
|
||||
successes_when_not_required = [
|
||||
('', NS(foo=None, bar=True)),
|
||||
]
|
||||
usage_when_required = '''\
|
||||
usage: PROG [-h] (--foo FOO | bar)
|
||||
'''
|
||||
usage_when_not_required = '''\
|
||||
usage: PROG [-h] [--foo FOO | bar]
|
||||
'''
|
||||
help = '''\
|
||||
|
||||
positional arguments:
|
||||
bar
|
||||
|
||||
options:
|
||||
-h, --help show this help message and exit
|
||||
--foo FOO
|
||||
'''
|
||||
|
||||
# =================================================
|
||||
# Mutually exclusive group in parent parser tests
|
||||
# =================================================
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue