Commitdb3ccd8

and

authored

[3.13]gh-53780: Ignore the first "--" (double dash) between an option and command in argparse (GH-124275) (GH-125073)

(cherry picked from commitc578271)Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

1 parenta380dc6 commitdb3ccd8Copy full SHA for db3ccd8

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2097,11 +2097,15 @@ def consume_positionals(start_index):`
`2097`	`2097`	`# and add the Positional and its args to the list`
`2098`	`2098`	`foraction,arg_countinzip(positionals,arg_counts):`
`2099`	`2099`	`args=arg_strings[start_index:start_index+arg_count]`
`2100`		`-# Strip out the first '--' if it is not in PARSER or REMAINDER arg.`
`2101`		`-if (action.nargsnotin [PARSER,REMAINDER]`
`2102`		`-andarg_strings_pattern.find('-',start_index,`
	`2100`	`+# Strip out the first '--' if it is not in REMAINDER arg.`
	`2101`	`+ifaction.nargs==PARSER:`
	`2102`	`+ifarg_strings_pattern[start_index]=='-':`
	`2103`	`+assertargs[0]=='--'`
	`2104`	`+args.remove('--')`
	`2105`	`+elifaction.nargs!=REMAINDER:`
	`2106`	`+if (arg_strings_pattern.find('-',start_index,`
`2103`	`2107`	`start_index+arg_count)>=0):`
`2104`		`-args.remove('--')`
	`2108`	`+args.remove('--')`
`2105`	`2109`	`start_index+=arg_count`
`2106`	`2110`	`ifargsandaction.deprecatedandaction.destnotinwarned:`
`2107`	`2111`	`self._warning(_("argument '%(argument_name)s' is deprecated")%`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6106,6 +6106,20 @@ def test_subparser(self):`
`6106`	`6106`	`"invalid choice: '--'",`
`6107`	`6107`	`parser.parse_args, ['--','x','--','run','a','b'])`
`6108`	`6108`
	`6109`	`+deftest_subparser_after_multiple_argument_option(self):`
	`6110`	`+parser=argparse.ArgumentParser(exit_on_error=False)`
	`6111`	`+parser.add_argument('--foo',nargs='*')`
	`6112`	`+subparsers=parser.add_subparsers()`
	`6113`	`+parser1=subparsers.add_parser('run')`
	`6114`	`+parser1.add_argument('-f')`
	`6115`	`+parser1.add_argument('bar',nargs='*')`
	`6116`	`+`
	`6117`	`+args=parser.parse_args(['--foo','x','y','--','run','a','b','-f','c'])`
	`6118`	`+self.assertEqual(NS(foo=['x','y'],f='c',bar=['a','b']),args)`
	`6119`	`+self.assertRaisesRegex(argparse.ArgumentError,`
	`6120`	`+"invalid choice: '--'",`
	`6121`	`+parser.parse_args, ['--foo','x','--','--','run','a','b'])`
	`6122`	`+`
`6109`	`6123`
`6110`	`6124`	`# ===========================`
`6111`	`6125`	`# parse_intermixed_args tests`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+:mod:`argparse` now ignores the first ``"--"`` (double dash) between an option and command.

Comments

(0)