From a9c7a8fa5bded740bba314cb07ebd3c99eba928e Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Fri, 3 Dec 2010 19:19:17 +0000
Subject: [PATCH] Fix incorrect use of gettext in argparse (#10497).
Steven, the maintainer of argparse, agreed to have this committed
without tests for now, since the fix is obvious. See the bug log.
---
Lib/argparse.py | 4 ++--
Misc/NEWS | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Lib/argparse.py b/Lib/argparse.py
index 855ff5b93f..63713c6c42 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1080,7 +1080,7 @@ class _SubParsersAction(Action):
parser = self._name_parser_map[parser_name]
except KeyError:
tup = parser_name, ', '.join(self._name_parser_map)
- msg = _('unknown parser %r (choices: %s)' % tup)
+ msg = _('unknown parser %r (choices: %s)') % tup
raise ArgumentError(self, msg)
# parse all the remaining options into the namespace
@@ -1121,7 +1121,7 @@ class FileType(object):
elif 'w' in self._mode:
return _sys.stdout
else:
- msg = _('argument "-" with mode %r' % self._mode)
+ msg = _('argument "-" with mode %r') % self._mode
raise ValueError(msg)
# all other arguments are used as file names
diff --git a/Misc/NEWS b/Misc/NEWS
index b0221cb9e6..d2e4fa80f3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,8 @@ Core and Builtins
Library
-------
+- Issue #10497: Fix incorrect use of gettext in argparse.
+
- Issue #10478: Reentrant calls inside buffered IO objects (for example by
way of a signal handler) now raise a RuntimeError instead of freezing the
current process.
--
2.50.0