From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 20 Nov 2019 13:48:25 +0000 (-0800)
Subject: bpo-38821: Fix crash in argparse when using gettext (GH-17192)
X-Git-Tag: v3.8.1rc1~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=836f137f7ae0799de937e5281cb1da2bfdb8a69d;p=thirdparty%2FPython%2Fcpython.git

bpo-38821: Fix crash in argparse when using gettext (GH-17192)

(cherry picked from commit be5c79e0338005d675a64ba6e5b137e850d556d1)

Co-authored-by: Federico Bond <federicobond@gmail.com>
---

diff --git a/Lib/argparse.py b/Lib/argparse.py
index e590225c8eb8..fd61bc78c2c3 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -2093,10 +2093,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
                 OPTIONAL: _('expected at most one argument'),
                 ONE_OR_MORE: _('expected at least one argument'),
             }
-            default = ngettext('expected %s argument',
+            msg = nargs_errors.get(action.nargs)
+            if msg is None:
+                msg = ngettext('expected %s argument',
                                'expected %s arguments',
                                action.nargs) % action.nargs
-            msg = nargs_errors.get(action.nargs, default)
             raise ArgumentError(action, msg)
 
         # return the number of arguments matched
diff --git a/Misc/NEWS.d/next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst b/Misc/NEWS.d/next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst
new file mode 100644
index 000000000000..2e7a22f661ac
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst
@@ -0,0 +1 @@
+Fix unhandled exceptions in :mod:`argparse` when internationalizing error messages for arguments with ``nargs`` set to special (non-integer) values.  Patch by Federico Bond.