Merge pull request #2791 from bsipocz/MAINT_fix_new_flake_issues

MAINT: fixing newly issues flake8 errors

Author: bsipocz

astroquery/alma/core.py

@@ -31,9 +31,9 @@
 from ..utils import commons
 from ..utils.process_asyncs import async_to_sync
 from ..query import BaseQuery, QueryWithLogin
-from .tapsql import _gen_pos_sql, _gen_str_sql, _gen_numeric_sql,\
-    _gen_band_list_sql, _gen_datetime_sql, _gen_pol_sql, _gen_pub_sql,\
-    _gen_science_sql, _gen_spec_res_sql, ALMA_DATE_FORMAT
+from .tapsql import (_gen_pos_sql, _gen_str_sql, _gen_numeric_sql,
+                     _gen_band_list_sql, _gen_datetime_sql, _gen_pol_sql, _gen_pub_sql,
+                     _gen_science_sql, _gen_spec_res_sql, ALMA_DATE_FORMAT)
 from . import conf, auth_urls
 from astroquery.exceptions import CorruptDataWarning
 

astroquery/atomic/tests/test_atomic.py

@@ -2,8 +2,7 @@
 
 from astropy.table import Table
 
-from ...atomic import AtomicLineList, Transition, AtomicTransition,\
-    MultiTransition
+from ...atomic import AtomicLineList, Transition, AtomicTransition, MultiTransition
 from ...atomic.utils import is_valid_transitions_param
 
 

astroquery/esa/xmm_newton/tests/test_xmm_newton.py

@@ -403,55 +403,55 @@ def test_get_epic_images(self, tmp_path):
         # an instrument
         for k, v in res[1].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
         for k, v in res[2].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
         for k, v in res[3].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
         for k, v in res[4].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
         for k, v in res[5].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
         for k, v in res[8].items():
             assert k in _instruments
-            if type(v) == str:
+            if isinstance(v, str):
                 f = os.path.split(v)
                 assert f[1] in self._files["0405320501"]["pps"]
-            if type(v) == list:
+            if isinstance(v, list):
                 for i in v:
                     f = os.path.split(i)
                     assert f[1] in self._files["0405320501"]["pps"]
@@ -462,9 +462,9 @@ def test_get_epic_images(self, tmp_path):
                 assert os.path.isdir(os.path.join(ob, t))
                 for b in res:
                     for i in res[b]:
-                        if type(res[b][i]) == str:
+                        if isinstance(res[b][i], str):
                             assert os.path.isfile(res[b][i])
-                        if type(res[b][i]) == list:
+                        if isinstance(res[b][i], list):
                             for f in res[b][i]:
                                 assert os.path.isfile(f)
 

astroquery/imcce/tests/test_skybot.py

@@ -108,7 +108,7 @@ def general_query(patch_request):
     a = core.Skybot.cone_search((0, 0), 0.5, 2451200)
 
     assert (len(a) == 141)
-    assert (type(a['Number'][0]) == int)
+    assert isinstance(a['Number'][0], int)
     assert (a['RA'][0] == 359.94077541666667*u.deg)
     assert (a['DEC'][0] == -0.013904166666666667*u.deg)
 

astroquery/mast/discovery_portal.py

@@ -453,7 +453,7 @@ def build_filter_set(self, column_config_name, service_name=None, **filters):
             if separator:
                 entry["separator"] = separator
             if colType == "continuous":
-                entry["values"] = [{"min": value[0], "max":value[1]}]
+                entry["values"] = [{"min": value[0], "max": value[1]}]
             else:
                 entry["values"] = value
             if free_text:

astroquery/mocserver/tests/test_mocserver.py

@@ -97,7 +97,7 @@ def test_request_results(patch_get, datafile):
     results = MOCServer.query_region(
         get_query_payload=False, verbose=True, data=datafile
     )
-    assert type(results) == Table
+    assert isinstance(results, Table)
 
 
 """

astroquery/sdss/tests/test_sdss.py

@@ -155,7 +155,7 @@ def compare_xid_data(xid, data):
 
 def image_tester(images, filetype):
     """Test that an image/spectrum is our fake data."""
-    assert type(images) == list
+    assert isinstance(images, list)
     with fits.open(data_path(DATA_FILES[filetype])) as data:
         assert images[0][0].header == data[0].header
         assert images[0][0].data == data[0].data

astroquery/vizier/tests/test_vizier.py

@@ -198,7 +198,7 @@ def test_find_resource_then_get(patch_post):
     assert next(iter(result.keys())).startswith(res.name)
 
     resultl = vizier.core.Vizier.get_catalogs([res])
-    assert type(result) == type(resultl)
+    assert isinstance(result, type(resultl))
     assert len(result) == len(resultl)
     assert len(result[0]) == len(resultl[0])