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
........

1 files changed, 7 insertions, 7 deletions

diff --git a/Lib/argparse.py b/Lib/argparse.py
index d5bc16c..9597a67 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1796,13 +1796,13 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                     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)