From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 29 Sep 2024 08:16:38 +0000 (+0200)
Subject: [3.12] gh-104860: Fix allow_abbrev=False for single-dash long options (GH-124340... 
X-Git-Tag: v3.12.7~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00fd32af21a3ff371cf12a509b324de9602af894;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-104860: Fix allow_abbrev=False for single-dash long options (GH-124340) (GH-124750)

(cherry picked from commit 49e105f9488de18d3d92948232fcbd956cbe0c6e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/argparse.py b/Lib/argparse.py
index d0302ad4fb6f..4f5867a4af6b 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -2361,7 +2361,7 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                     action = self._option_string_actions[option_string]
                     tup = action, option_string, '', short_explicit_arg
                     result.append(tup)
-                elif option_string.startswith(option_prefix):
+                elif self.allow_abbrev and option_string.startswith(option_prefix):
                     action = self._option_string_actions[option_string]
                     tup = action, option_string, None, None
                     result.append(tup)
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 854a50feebd0..5d4fd3d42777 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -957,6 +957,23 @@ class TestOptionalsDisallowLongAbbreviationPrefixChars(ParserTestCase):
     ]
 
 
+class TestOptionalsDisallowSingleDashLongAbbreviation(ParserTestCase):
+    """Do not allow abbreviations of long options at all"""
+
+    parser_signature = Sig(allow_abbrev=False)
+    argument_signatures = [
+        Sig('-foo'),
+        Sig('-foodle', action='store_true'),
+        Sig('-foonly'),
+    ]
+    failures = ['-foon 3', '-food', '-food -foo 2']
+    successes = [
+        ('', NS(foo=None, foodle=False, foonly=None)),
+        ('-foo 3', NS(foo='3', foodle=False, foonly=None)),
+        ('-foonly 7 -foodle -foo 2', NS(foo='2', foodle=True, foonly='7')),
+    ]
+
+
 class TestDisallowLongAbbreviationAllowsShortGrouping(ParserTestCase):
     """Do not allow abbreviations of long options at all"""
 
diff --git a/Misc/NEWS.d/next/Library/2024-09-23-17-33-47.gh-issue-104860.O86OSc.rst b/Misc/NEWS.d/next/Library/2024-09-23-17-33-47.gh-issue-104860.O86OSc.rst
new file mode 100644
index 000000000000..707c4d651cb5
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-09-23-17-33-47.gh-issue-104860.O86OSc.rst
@@ -0,0 +1,2 @@
+Fix disallowing abbreviation of single-dash long options in :mod:`argparse`
+with ``allow_abbrev=False``.