Merge pull request #2306 from eerovaher/refactor-systools

Refactor `astroquery/utils/system_tools.py` and its tests

Author: bsipocz

astroquery/utils/system_tools.py

@@ -1,15 +1,8 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
+import gzip
 import os
-
-# Import DEVNULL for py3 or py3
-try:
-    from subprocess import DEVNULL
-except ImportError:
-    DEVNULL = open(os.devnull, 'wb')
-
-# Check availability of some system tools
-# Exceptions are raised if not found
+import shutil
 
 
 def gunzip(filename):
@@ -19,17 +12,13 @@ def gunzip(filename):
     ----------
     filename : str
         Fully qualified path of the file to decompress.
+
     Returns
     -------
     filename : str
         Name of the decompressed file (or input filename if gzip is not
         available).
     """
-    import shutil
-    import gzip
-
-    # system-wide 'gzip' was removed, Python gzip used instead.
-    # See #1538 : https://github.com/astropy/astroquery/issues/1538
 
     # ".fz" denotes RICE rather than gzip compression
     if not filename.endswith('.fz'):

astroquery/utils/tests/test_system_tools.py

@@ -1,44 +1,18 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-try:
-    import gzip
-
-    HAS_GZIP = True
-except ImportError:
-    HAS_GZIP = False
-
-import shutil
-import os
-from os.path import exists
-import tempfile
-
-import pytest
+import gzip
 
 from ..system_tools import gunzip
 
 
-@pytest.mark.skipif("not HAS_GZIP")
-def test_gunzip():
-
-    temp_dir = tempfile.mkdtemp()
-    filename = f"{temp_dir}{os.sep}test_gunzip.txt.gz"
-    unziped_filename = filename.rsplit(".", 1)[0]
-
+def test_gunzip(tmp_path):
+    filename = tmp_path / 'test_gunzip.txt.gz'
     # First create a gzip file
     content = b"Bla"
     with gzip.open(filename, "wb") as f:
         f.write(content)
-
-    try:
-        # Then test our gunzip command works and creates an unziped file
-        gunzip(filename)
-        assert exists(unziped_filename)
-
-        # Check content is the same
-        with open(unziped_filename, "rb") as f:
-            new_content = f.read()
-        assert new_content == content
-
-    finally:
-        # Clean
-        shutil.rmtree(temp_dir)
+    # Then test our gunzip command works
+    gunzip(str(filename))
+    with open(filename.with_suffix(''), "rb") as f:
+        new_content = f.read()
+    assert new_content == content