style

Author: lvalerom

astroquery/esa/hsa/core.py

@@ -115,7 +115,6 @@ def download_data(self, *, retrieval_type="OBSERVATION", observation_id=None,
 
         _, res_params = cgi.parse_header(response.headers['Content-Disposition'])
 
-
         r_filename = res_params["filename"]
         suffixes = Path(r_filename).suffixes
 

astroquery/esa/hsa/tests/test_hsa_remote.py

@@ -27,7 +27,6 @@ def access_archive_with_retries(self, f, params):
                 pass
         return None
 
-
     def test_download_data_observation_pacs(self):
         obs_id = "1342191813"
         parameters = {'retrieval_type': "OBSERVATION",
@@ -38,16 +37,13 @@ def test_download_data_observation_pacs(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".tar")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
-        chksum = []
         tar = tarfile.open(res)
-        for m in tar.getmembers():
-            chksum.append(m.chksum)
+        chksum = [m.chksum for m in tar.getmembers()]
         assert chksum.sort() == pacs_chksum.sort()
         os.remove(res)
 
@@ -63,16 +59,13 @@ def test_download_data_observation_pacs_filename(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, fname + ".tar")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
-        chksum = []
         tar = tarfile.open(res)
-        for m in tar.getmembers():
-            chksum.append(m.chksum)
+        chksum = [m.chksum for m in tar.getmembers()]
         assert chksum.sort() == pacs_chksum.sort()
         os.remove(res)
 
@@ -87,16 +80,13 @@ def test_download_data_observation_pacs_compressed(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".tgz")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
-        chksum = []
         tar = tarfile.open(res)
-        for m in tar.getmembers():
-            chksum.append(m.chksum)
+        chksum = [m.chksum for m in tar.getmembers()]
         assert chksum.sort() == pacs_chksum.sort()
         os.remove(res)
 
@@ -110,16 +100,13 @@ def test_download_data_observation_spire(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".tar")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
-        chksum = []
         tar = tarfile.open(res)
-        for m in tar.getmembers():
-            chksum.append(m.chksum)
+        chksum = [m.chksum for m in tar.getmembers()]
         assert chksum.sort() == spire_chksum.sort()
         os.remove(res)
 
@@ -132,9 +119,8 @@ def test_download_data_postcard_pacs(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".jpg")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
@@ -151,9 +137,8 @@ def test_download_data_postcard_pacs_filename(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, fname + ".jpg")
         hsa = HSAClass()
-        #res = hsa.download_data(**parameters)
         res = self.access_archive_with_retries(hsa.download_data, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
@@ -168,16 +153,13 @@ def test_get_observation(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".tar")
         hsa = HSAClass()
-        #res = hsa.get_observation(**parameters)
         res = self.access_archive_with_retries(hsa.get_observation, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)
-        chksum = []
         tar = tarfile.open(res)
-        for m in tar.getmembers():
-            chksum.append(m.chksum)
+        chksum = [m.chksum for m in tar.getmembers()]
         assert chksum.sort() == pacs_chksum.sort()
         os.remove(res)
 
@@ -189,9 +171,8 @@ def test_get_postcard(self):
                       'download_dir': self.tmp_dir.name}
         expected_res = os.path.join(self.tmp_dir.name, obs_id + ".jpg")
         hsa = HSAClass()
-        #res = hsa.get_postcard(**parameters)
         res = self.access_archive_with_retries(hsa.get_postcard, parameters)
-        if res == None:
+        if res is None:
             pytest.skip("Archive broke the connection {} times, unable to test".format(self.retries))
         assert res == expected_res
         assert os.path.isfile(res)