gh-80448: argparse: Fix IndexError on store_true action (GH-15656)

(cherry picked from commit e02cc6d42aee1f0a9ee629f76576eee478224d9d)

Co-authored-by: Hai Shi <shihai1992@gmail.com>
Co-authored-by: Rémi Lapeyre <remi.lapeyre@henki.fr>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 9be18488abe5ba6f3fc21eab86cccc8743e54b2a..fb042a86b47c0558aaaba4aa5bd24c354540845b 100644 (file)
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1962,7 +1962,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                     # arguments, try to parse more single-dash options out
                     # of the tail of the option string
                     chars = self.prefix_chars
-                    if arg_count == 0 and option_string[1] not in chars:
+                    if (
+                        arg_count == 0
+                        and option_string[1] not in chars
+                        and explicit_arg != ''
+                    ):
                         action_tuples.append((action, [], option_string))
                         char = option_string[0]
                         option_string = char + explicit_arg[0]

diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 0b237ab5b93023995e10b9e53b06df7fa9c5df23..4d43e3310d4945a6de687f9a3ec21a1f8e1090fd 100644 (file)
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -295,7 +295,7 @@ class TestOptionalsSingleDashCombined(ParserTestCase):
         Sig('-z'),
     ]
     failures = ['a', '--foo', '-xa', '-x --foo', '-x -z', '-z -x',
-                '-yx', '-yz a', '-yyyx', '-yyyza', '-xyza']
+                '-yx', '-yz a', '-yyyx', '-yyyza', '-xyza', '-x=']
     successes = [
         ('', NS(x=False, yyy=None, z=None)),
         ('-x', NS(x=True, yyy=None, z=None)),

diff --git a/Misc/NEWS.d/next/Library/2019-09-03-15-45-19.bpo-36267.z42Ex7.rst b/Misc/NEWS.d/next/Library/2019-09-03-15-45-19.bpo-36267.z42Ex7.rst
new file mode 100644 (file)
index 0000000..7c9b592
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-09-03-15-45-19.bpo-36267.z42Ex7.rst
@@ -0,0 +1 @@
+Fix IndexError in :class:`argparse.ArgumentParser` when a ``store_true`` action is given an explicit argument.