diff options
| -rw-r--r-- | Lib/argparse.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_argparse.py | 19 |
2 files changed, 27 insertions, 2 deletions
diff --git a/Lib/argparse.py b/Lib/argparse.py index 9597a671fa..318e49ba95 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -392,10 +392,16 @@ class HelpFormatter(object): for action in group._group_actions: group_actions.add(action) if not group.required: - inserts[start] = '[' + if start in inserts: + inserts[start] += ' [' + else: + inserts[start] = '[' inserts[end] = ']' else: - inserts[start] = '(' + if start in inserts: + inserts[start] += ' (' + else: + inserts[start] = '(' inserts[end] = ')' for i in range(start + 1, end): inserts[i] = '|' diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index 9fd8c02822..777a4af13f 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -2174,6 +2174,25 @@ class TestMutuallyExclusiveGroupErrors(TestCase): raises(ValueError, add_argument, 'bar', nargs=1) raises(ValueError, add_argument, 'bar', nargs=argparse.PARSER) + def test_help(self): + parser = ErrorRaisingArgumentParser(prog='PROG') + group1 = parser.add_mutually_exclusive_group() + group1.add_argument('--foo', action='store_true') + group1.add_argument('--bar', action='store_false') + group2 = parser.add_mutually_exclusive_group() + group2.add_argument('--soup', action='store_true') + group2.add_argument('--nuts', action='store_false') + expected = '''\ + usage: PROG [-h] [--foo | --bar] [--soup | --nuts] + + optional arguments: + -h, --help show this help message and exit + --foo + --bar + --soup + --nuts + ''' + self.assertEqual(parser.format_help(), textwrap.dedent(expected)) class MEMixin(object): |