diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-02-26 01:13:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 01:13:17 (GMT) |
| commit | adea9b86a97794ca75054603497c195d5ba39aa5 (patch) | |
| tree | dc28422f69f4c7ad72d50909aa683a9d4a711b84 | |
| parent | f82578ace103ec977cec3424b20e0b5f19cf720e (diff) | |
| download | cpython-adea9b86a97794ca75054603497c195d5ba39aa5.zip cpython-adea9b86a97794ca75054603497c195d5ba39aa5.tar.gz cpython-adea9b86a97794ca75054603497c195d5ba39aa5.tar.bz2 | |
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>
| -rw-r--r-- | Lib/gzip.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_gzip.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-02-25-09-44-36.bpo-43316.k9Gyqn.rst | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Lib/gzip.py b/Lib/gzip.py index e422773..8002b43 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -583,8 +583,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 0f235d1..66ae51a 100644 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -772,10 +772,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 0000000..1f0d3c4 --- /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. |