From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 13 Sep 2019 09:45:27 +0000 (-0700)
Subject: bpo-37785: Fix xgettext warning in argparse (GH-15161)
X-Git-Tag: v3.8.0rc1~124
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8750dfe09eaec24231e19962d17d171c323794ad;p=python

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

(cherry picked from commit 42671aea2db6cbc54369617da0fd3545048e0a45)

Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
---

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 456ec8bb7f..e590225c8e 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1214,8 +1214,9 @@ class FileType(object):
             return open(string, self._mode, self._bufsize, self._encoding,
                         self._errors)
         except OSError as e:
-            message = _("can't open '%s': %s")
-            raise ArgumentTypeError(message % (string, e))
+            args = {'filename': string, 'error': e}
+            message = _("can't open '%(filename)s': %(error)s")
+            raise ArgumentTypeError(message % args)
 
     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
new file mode 100644
index 0000000000..2d3aa4f9a7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst
@@ -0,0 +1 @@
+Fix xgettext warnings in :mod:`argparse`.