[Python-checkins] r86091 - in python/branches/release27-maint: Lib/argparse.py Lib/test/test_argparse.py

[steven.bethard]

Author: steven.bethard
Date: Mon Nov  1 16:59:35 2010
New Revision: 86091

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

........
  r86090 | steven.bethard | 2010-11-01 16:57:36 +0100 (Mon, 01 Nov 2010) | 1 line
  
  Fix bug 9352 where characters were being lost in parsing some short options
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/argparse.py
   python/branches/release27-maint/Lib/test/test_argparse.py

Modified: python/branches/release27-maint/Lib/argparse.py
==============================================================================
--- python/branches/release27-maint/Lib/argparse.py	(original)
+++ python/branches/release27-maint/Lib/argparse.py	Mon Nov  1 16:59:35 2010
@@ -1796,13 +1796,13 @@
                     chars = self.prefix_chars
                     if arg_count == 0 and option_string[1] not in chars:
                         action_tuples.append((action, [], option_string))
-                        for char in self.prefix_chars:
-                            option_string = char + explicit_arg[0]
-                            explicit_arg = explicit_arg[1:] or None
-                            optionals_map = self._option_string_actions
-                            if option_string in optionals_map:
-                                action = optionals_map[option_string]
-                                break
+                        char = option_string[0]
+                        option_string = char + explicit_arg[0]
+                        new_explicit_arg = explicit_arg[1:] or None
+                        optionals_map = self._option_string_actions
+                        if option_string in optionals_map:
+                            action = optionals_map[option_string]
+                            explicit_arg = new_explicit_arg
                         else:
                             msg = _('ignored explicit argument %r')
                             raise ArgumentError(action, msg % explicit_arg)

Modified: python/branches/release27-maint/Lib/test/test_argparse.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_argparse.py	(original)
+++ python/branches/release27-maint/Lib/test/test_argparse.py	Mon Nov  1 16:59:35 2010
@@ -468,6 +468,30 @@
         ('/ba +f', NS(f=True, bar=None, baz=42))
     ]
 
+
+class TestOptionalsAlternatePrefixCharsMultipleShortArgs(ParserTestCase):
+    """Verify that Optionals must be called with their defined prefixes"""
+
+    parser_signature = Sig(prefix_chars='+-', add_help=False)
+    argument_signatures = [
+        Sig('-x', action='store_true'),
+        Sig('+y', action='store_true'),
+        Sig('+z', action='store_true'),
+    ]
+    failures = ['-w',
+                '-xyz',
+                '+x',
+                '-y',
+                '+xyz',
+    ]
+    successes = [
+        ('', NS(x=False, y=False, z=False)),
+        ('-x', NS(x=True, y=False, z=False)),
+        ('+y -x', NS(x=True, y=True, z=False)),
+        ('+yz -x', NS(x=True, y=True, z=True)),
+    ]
+
+
 class TestOptionalsShortLong(ParserTestCase):
     """Test a combination of single- and double-dash option strings"""