[Python-checkins] Revert "bpo-37785: Fix xgettext warning in argparse (GH-15161)" (GH-16082)

[Julien Palard]

https://github.com/python/cpython/commit/f14fcbf2995b43c8607a1448402633ac558a745f
commit: f14fcbf2995b43c8607a1448402633ac558a745f
branch: 3.7
author: Julien Palard <julien at palard.fr>
committer: GitHub <noreply at github.com>
date: 2019-09-13T12:20:14+02:00
summary:

Revert "bpo-37785: Fix xgettext warning in argparse (GH-15161)" (GH-16082)

This reverts commit b50eff65906f8e9b4597cb0128ea1729341346fc because
it's an incompatible change that would have broken the existing
translations.

files:
D Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst
M Lib/argparse.py

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 35d77a88a247..24af355b7441 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1207,9 +1207,8 @@ def __call__(self, string):
             return open(string, self._mode, self._bufsize, self._encoding,
                         self._errors)
         except OSError as e:
-            args = {'filename': string, 'error': e}
-            message = _("can't open '%(filename)s': %(error)s")
-            raise ArgumentTypeError(message % args)
+            message = _("can't open '%s': %s")
+            raise ArgumentTypeError(message % (string, e))
 
     def __repr__(self):
         args = self._mode, self._bufsize
diff --git a/Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst b/Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst
deleted file mode 100644
index 2d3aa4f9a75a..000000000000
--- a/Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix xgettext warnings in :mod:`argparse`.