[Python-checkins] r86990 - in python/branches/release27-maint: Lib/argparse.py Misc/NEWS

[eric.araujo]

Author: eric.araujo
Date: Fri Dec  3 20:24:49 2010
New Revision: 86990

Log:
Merged revisions 86985 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  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.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/argparse.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/argparse.py
==============================================================================
--- python/branches/release27-maint/Lib/argparse.py	(original)
+++ python/branches/release27-maint/Lib/argparse.py	Fri Dec  3 20:24:49 2010
@@ -1080,7 +1080,7 @@
             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 @@
             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

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Fri Dec  3 20:24:49 2010
@@ -1,4 +1,4 @@
-+++++++++++
+:xq
 Python News
 +++++++++++
 
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #10497: Fix incorrect use of gettext in argparse.
+
 - Issue #10464: netrc now correctly handles lines with embedded '#' characters.