8000 gh-124345: Support abbreviated single-dash long options with = in arg… · python/cpython@6118044 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6118044

Browse files
serhiy-storchakaserhiy-storchaka
authored
gh-124345: Support abbreviated single-dash long options with = in argparse (GH-124428)
1 parent 9bcadf5 commit 6118044

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

‎Lib/argparse.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2319,7 +2319,9 @@ def _get_option_tuples(self, option_string):
23192319
# but multiple character options always have to have their argument
23202320
# separate
23212321
elif option_string[0] in chars and option_string[1] not in chars:
2322-
option_prefix = option_string
2322+
option_prefix, sep, explicit_arg = option_string.partition('=')
2323+
if not sep:
2324+
sep = explicit_arg = None
23232325
short_option_prefix = option_string[:2]
23242326
short_explicit_arg = option_string[2:]
23252327

@@ -2330,7 +2332,7 @@ def _get_option_tuples(self, option_string):
23302332
result.append(tup)
23312333
elif self.allow_abbrev and option_string.startswith(option_prefix):
23322334
action = self._option_string_actions[option_string]
2333-
tup = action, option_string, None, None
2335+
tup = action, option_string, sep, explicit_arg
23342336
result.append(tup)
23352337

23362338
# shouldn't ever get here

‎Lib/test/test_argparse.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,15 +380,22 @@ class TestOptionalsSingleDashAmbiguous(ParserTestCase):
380380
"""Test Optionals that partially match but are not subsets"""
381381

382382
argument_signatures = [Sig('-foobar'), Sig('-foorab')]
383-
failures = ['-f', '-f a', '-fa', '-foa', '-foo', '-fo', '-foo b']
383+
failures = ['-f', '-f a', '-fa', '-foa', '-foo', '-fo', '-foo b',
384+
'-f=a', '-foo=b']
384385
successes = [
385386
('', NS(foobar=None, foorab=None)),
386387
('-foob a', NS(foobar='a', foorab=None)),
388+
('-foob=a', NS(foobar='a', foorab=None)),
387389
('-foor a', NS(foobar=None, foorab='a')),
390+
('-foor=a', NS(foobar=None, foorab='a')),
388391
('-fooba a', NS(foobar='a', foorab=None)),
392+
('-fooba=a', NS(foobar='a', foorab=None)),
389393
('-foora a', NS(foobar=None, foorab='a')),
394+
('-foora=a', NS(foobar=None, foorab='a')),
390395
('-foobar a', NS(foobar='a', foorab=None)),
396+
('-foobar=a', NS(foobar='a', foorab=None)),
391397
('-foorab a', NS(foobar=None, foorab='a')),
398+
('-foorab=a', NS(foobar=None, foorab='a')),
392399
]
393400

394401

@@ -875,7 +882,9 @@ class TestOptionalsAllowLongAbbreviation(ParserTestCase):
875882
successes = [
876883
('', NS(foo=None, foobaz=None, fooble=False)),
877884
('--foo 7', NS(foo='7', foobaz=None, fooble=False)),
885+
('--foo=7', NS(foo='7', foobaz=None, fooble=False)),
878886
('--fooba a', NS(foo=None, foobaz='a', fooble=False)),
887+
('--fooba=a', NS(foo=None, foobaz='a', fooble=False)),
879888
('--foobl --foo g', NS(foo='g', foobaz=None, fooble=True)),
880889
]
881890

‎Misc/NEWS.d/next/Library/2024-09-24-12-34-48.gh-issue-124345.s3vKql.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
:mod:`argparse` vim supports abbreviated single-dash long options separated
2+
by ``=`` from its value.

0 commit comments

Comments
 (0)
0