[Python-checkins] bpo-43316: gzip: Fix sys.exit() usage. (GH-24652)

miss-islington webhook-mailer at python.org
Thu Feb 25 21:36:53 EST 2021


https://github.com/python/cpython/commit/07ab490a7a966ce00a61bf56ccd0604434b143a5
commit: 07ab490a7a966ce00a61bf56ccd0604434b143a5
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2021-02-25T18:36:49-08:00
summary:

bpo-43316: gzip: Fix sys.exit() usage. (GH-24652)

(cherry picked from commit 9525a18b5bb317d9fb206c992ab62aa41559b0c8)

Co-authored-by: Inada Naoki <songofacandy at gmail.com>

files:
M Lib/gzip.py
M Lib/test/test_gzip.py

diff --git a/Lib/gzip.py b/Lib/gzip.py
index 3dd8564bec35d..1101d35a5f1bd 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -575,7 +575,7 @@ def main():
                 g = sys.stdout.buffer
             else:
                 if arg[-3:] != ".gz":
-                    sys.exit("filename doesn't end in .gz:", repr(arg))
+                    sys.exit(f"filename doesn't end in .gz: {arg!r}")
                 f = open(arg, "rb")
                 g = builtins.open(arg[:-3], "wb")
         else:
diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index 4bbc7424eb8a5..5c70a9e726356 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -761,7 +761,7 @@ def test_decompress_infile_outfile(self):
 
     def test_decompress_infile_outfile_error(self):
         rc, out, err = assert_python_failure('-m', 'gzip', '-d', 'thisisatest.out')
-        self.assertIn(b"filename doesn't end in .gz:", err)
+        self.assertEqual(b"filename doesn't end in .gz: 'thisisatest.out'", err.strip())
         self.assertEqual(rc, 1)
         self.assertEqual(out, b'')
 



More information about the Python-checkins mailing list