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

42671aea · Jakub Kulík · Julien Palard · 7183064e · 42671aea · 42671aea
Commit 42671aea authored Sep 13, 2019 by Jakub Kulík Committed by Julien Palard Sep 13, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Lib/argparse.py Lib/argparse.py +3 -2

Misc/NEWS.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst ...S.d/next/Library/2019-08-07-14-49-22.bpo-37785.y7OlT8.rst +1 -0

No files found.
--- 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

--- 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
+Fix xgettext warnings in :mod:`argparse`.