Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect use of gettext in argparse (#10497).

Browse source 
Steven, the maintainer of argparse, agreed to have this committed
without tests for now, since the fix is obvious.  See the bug log.
This commit is contained in:
Éric Araujo 2010-12-03 19:19:17 +00:00
parent bed81c882b
commit a9c7a8fa5b
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/argparse.py
View file

@ -1080,7 +1080,7 @@ def __call__(self, parser, namespace, values, option_string=None):
parser = self._name_parser_map[parser_name] parser = self._name_parser_map[parser_name]
except KeyError: except KeyError:
tup = parser_name, ', '.join(self._name_parser_map) 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) raise ArgumentError(self, msg)
# parse all the remaining options into the namespace # parse all the remaining options into the namespace
@ -1121,7 +1121,7 @@ def __call__(self, string):
elif 'w' in self._mode: elif 'w' in self._mode:
return _sys.stdout return _sys.stdout
else: else:
msg = _('argument "-" with mode %r' % self._mode) msg = _('argument "-" with mode %r') % self._mode
raise ValueError(msg) raise ValueError(msg)
# all other arguments are used as file names # all other arguments are used as file names

2
Misc/NEWS
View file

@ -35,6 +35,8 @@ Core and Builtins
Library Library
------- -------
- Issue #10497: Fix incorrect use of gettext in argparse.
- Issue #10478: Reentrant calls inside buffered IO objects (for example by - Issue #10478: Reentrant calls inside buffered IO objects (for example by
way of a signal handler) now raise a RuntimeError instead of freezing the way of a signal handler) now raise a RuntimeError instead of freezing the
current process. current process.