From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 25 Feb 2021 11:52:11 +0000 (-0800)
Subject: bpo-43316:  gzip: CLI uses non-zero return code on error. (GH-24647)
X-Git-Tag: v3.8.9~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69906c505b139cbd892866dbceeb607eff53ab3b;p=thirdparty%2FPython%2Fcpython.git

bpo-43316:  gzip: CLI uses non-zero return code on error. (GH-24647)


Exit code is now 1 instead of 0. A message is printed to stderr instead of stdout. This is
the proper behaviour for a tool that can be used in scripts.
(cherry picked from commit cc3df6368d4f3f6c9c9b716876c7e7b79c7abf3f)

Co-authored-by: Ruben Vorderman <r.h.p.vorderman@lumc.nl>
---

diff --git a/Lib/gzip.py b/Lib/gzip.py
index 87b553df66cd..3dd8564bec35 100644
--- a/Lib/gzip.py
+++ b/Lib/gzip.py
@@ -575,8 +575,7 @@ def main():
                 g = sys.stdout.buffer
             else:
                 if arg[-3:] != ".gz":
-                    print("filename doesn't end in .gz:", repr(arg))
-                    continue
+                    sys.exit("filename doesn't end in .gz:", repr(arg))
                 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 646828621a53..4bbc7424eb8a 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -760,10 +760,10 @@ class TestCommandLine(unittest.TestCase):
         self.assertEqual(err, b'')
 
     def test_decompress_infile_outfile_error(self):
-        rc, out, err = assert_python_ok('-m', 'gzip', '-d', 'thisisatest.out')
-        self.assertIn(b"filename doesn't end in .gz:", out)
-        self.assertEqual(rc, 0)
-        self.assertEqual(err, b'')
+        rc, out, err = assert_python_failure('-m', 'gzip', '-d', 'thisisatest.out')
+        self.assertIn(b"filename doesn't end in .gz:", err)
+        self.assertEqual(rc, 1)
+        self.assertEqual(out, b'')
 
     @create_and_remove_directory(TEMPDIR)
     def test_compress_stdin_outfile(self):
diff --git a/Misc/NEWS.d/next/Library/2021-02-25-09-44-36.bpo-43316.k9Gyqn.rst b/Misc/NEWS.d/next/Library/2021-02-25-09-44-36.bpo-43316.k9Gyqn.rst
new file mode 100644
index 000000000000..1f0d3c499c16
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-02-25-09-44-36.bpo-43316.k9Gyqn.rst
@@ -0,0 +1,3 @@
+The ``python -m gzip`` command line application now properly fails when
+detecting an unsupported extension. It exits with a non-zero exit code and
+prints an error message to stderr.