From be5c79e0338005d675a64ba6e5b137e850d556d1 Mon Sep 17 00:00:00 2001 From: Federico Bond Date: Wed, 20 Nov 2019 10:29:29 -0300 Subject: [PATCH] bpo-38821: Fix crash in argparse when using gettext (GH-17192) --- Lib/argparse.py | 5 +++-- .../next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-11-16-23-26-25.bpo-38821.-albNN.rst diff --git a/Lib/argparse.py b/Lib/argparse.py index 94e1b8ad0ed..5a8eff2f4cc 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -2148,10 +2148,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 00000000000..2e7a22f661a --- /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.