https://github.com/python/cpython/commit/ecb2afc1bc1c2f3f9f99b09dd866100c3c7... commit: ecb2afc1bc1c2f3f9f99b09dd866100c3c7dcab7 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> committer: GitHub <noreply@github.com> date: 2019-11-20T05:48:20-08:00 summary: bpo-38821: Fix crash in argparse when using gettext (GH-17192) (cherry picked from commit be5c79e0338005d675a64ba6e5b137e850d556d1) Co-authored-by: Federico Bond <federicobond@gmail.com> files: A Misc/NEWS.d/next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst M Lib/argparse.py diff --git a/Lib/argparse.py b/Lib/argparse.py index 24af355b74413..ac424f4914516 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -2080,10 +2080,11 @@ def _match_argument(self, action, arg_strings_pattern): 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 0000000000000..2e7a22f661ac6 --- /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.