From fb3de6b437ba92701e162eb830bbc775cda135b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Fri, 3 Dec 2010 19:24:49 +0000 Subject: Merged revisions 86985 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ r86985 | eric.araujo | 2010-12-03 20:19:17 +0100 (ven., 03 déc. 2010) | 5 lines 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 | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib/argparse.py b/Lib/argparse.py index 9837432..78f4dcb 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 89894d8..82a4cd5 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1,4 +1,4 @@ -+++++++++++ +:xq Python News +++++++++++ @@ -13,6 +13,8 @@ Core and Builtins Library ------- +- Issue #10497: Fix incorrect use of gettext in argparse. + - Issue #10464: netrc now correctly handles lines with embedded '#' characters. -- cgit v0.12