diff --git a/Lib/argparse.py b/Lib/argparse.py index 9be18488abe5ba..fb042a86b47c05 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1962,7 +1962,11 @@ def consume_optional(start_index): # 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 0b237ab5b93023..4d43e3310d4945 100644 --- 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 index 00000000000000..7c9b592d6ecdf5 --- /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.