From: Steven Bethard <steven.bethard@gmail.com>
Date: Mon, 1 Nov 2010 16:30:24 +0000 (+0000)
Subject: Merged revisions 86092 via svnmerge from
X-Git-Tag: v2.7.1rc1~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=68c3678253eb0bf1a15537d2725df9af15e2c913;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 86092 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86092 | steven.bethard | 2010-11-01 17:29:26 +0100 (Mon, 01 Nov 2010) | 1 line

  Fix for issue 9355 where with multiple mutually exclusive arguments, some brackets were being lost in the usage messages
........
---

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 9597a671fadd..318e49ba9560 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 9fd8c02822b3..777a4af13f94 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):