Cleaning up super() calls

bsipocz · bsipocz · commit 1dc3b734dfc0 · 2022-05-04T20:20:11.000-07:00
Using this darling: gsed -i -e 's|\(.*super(\)\(.*)\.\)\(.*)\)|\1).\3|g'
diff --git a/astroquery/alfalfa/tests/test_alfalfa.py b/astroquery/alfalfa/tests/test_alfalfa.py
@@ -15,7 +15,7 @@
 class MockResponseAlfalfa(MockResponse):
 
     def __init__(self, content, **kwargs):
-        super(MockResponseAlfalfa, self).__init__(content, **kwargs)
+        super().__init__(content, **kwargs)
 
     def iter_lines(self):
         for line in self.text.split("\n"):
diff --git a/astroquery/alma/core.py b/astroquery/alma/core.py
@@ -193,7 +193,7 @@ class AlmaClass(QueryWithLogin):
 
     def __init__(self):
         # sia service does not need disambiguation but tap does
-        super(AlmaClass, self).__init__()
+        super().__init__()
         self._sia = None
         self._tap = None
         self._datalink = None
diff --git a/astroquery/astrometry_net/core.py b/astroquery/astrometry_net/core.py
@@ -104,7 +104,7 @@ def show_allowed_settings(self):
 
     def __init__(self):
         """ Show a warning message if the API key is not in the configuration file. """
-        super(AstrometryNetClass, self).__init__()
+        super().__init__()
         if not conf.api_key:
             log.warning("Astrometry.net API key not found in configuration file")
             log.warning("You need to manually edit the configuration file and add it")
diff --git a/astroquery/atomic/core.py b/astroquery/atomic/core.py
@@ -26,7 +26,7 @@ class AtomicLineListClass(BaseQuery):
     TIMEOUT = conf.timeout
 
     def __init__(self):
-        super(AtomicLineListClass, self).__init__()
+        super().__init__()
         self.__default_form_values = None
 
     def query_object(self, *, wavelength_range=None, wavelength_type=None, wavelength_accuracy=None, element_spectrum=None,
diff --git a/astroquery/besancon/core.py b/astroquery/besancon/core.py
@@ -87,7 +87,7 @@ class BesanconClass(BaseQuery):
     result_re = re.compile(r"[0-9]{10}\.[0-9]{6}\.resu")
 
     def __init__(self, email=None):
-        super(BesanconClass, self).__init__()
+        super().__init__()
         self.email = email
 
     def get_besancon_model_file(self, filename, verbose=True, timeout=5.0):
diff --git a/astroquery/besancon/tests/test_besancon.py b/astroquery/besancon/tests/test_besancon.py
@@ -105,6 +105,6 @@ def test_default_params():
 class MockResponseBesancon(MockResponse):
 
     def __init__(self, content=None, url=None, headers={}, **kwargs):
-        super(MockResponseBesancon, self).__init__(content)
+        super().__init__(content)
         self.raw = url  # StringIO.StringIO(url)
         self.headers = headers
diff --git a/astroquery/cadc/core.py b/astroquery/cadc/core.py
@@ -88,7 +88,7 @@ def __init__(self, url=None, auth_session=None):
         Cadc object
         """
 
-        super(CadcClass, self).__init__()
+        super().__init__()
         self.baseurl = url
         # _auth_session contains the credentials that are used by both
         # the cadc tap and cadc datalink services
diff --git a/astroquery/casda/core.py b/astroquery/casda/core.py
@@ -50,7 +50,7 @@ class CasdaClass(BaseQuery):
     _uws_ns = {'uws': 'http://www.ivoa.net/xml/UWS/v1.0'}
 
     def __init__(self, user=None, password=None):
-        super(CasdaClass, self).__init__()
+        super().__init__()
         if user is None:
             self._authenticated = False
         else:
diff --git a/astroquery/cds/core.py b/astroquery/cds/core.py
@@ -52,7 +52,7 @@ class CdsClass(BaseQuery):
     TIMEOUT = conf.timeout
 
     def __init__(self):
-        super(CdsClass, self).__init__()
+        super().__init__()
         self.path_moc_file = None
         self.return_moc = False
 
diff --git a/astroquery/cosmosim/core.py b/astroquery/cosmosim/core.py
@@ -40,7 +40,7 @@ class CosmoSimClass(QueryWithLogin):
     USERNAME = conf.username
 
     def __init__(self):
-        super(CosmoSimClass, self).__init__()
+        super().__init__()
 
     def _login(self, username=None, password=None, store_password=False,
                reenter_password=False):
diff --git a/astroquery/esa/hubble/core.py b/astroquery/esa/hubble/core.py
@@ -44,7 +44,7 @@ class ESAHubbleClass(BaseQuery):
     copying_string = "Copying file to {0}..."
 
     def __init__(self, tap_handler=None):
-        super(ESAHubbleClass, self).__init__()
+        super().__init__()
 
         if tap_handler is None:
             self._tap = TapPlus(url="http://hst.esac.esa.int"
diff --git a/astroquery/esa/iso/core.py b/astroquery/esa/iso/core.py
@@ -31,7 +31,7 @@ class ISOClass(BaseQuery):
     TIMEOUT = conf.TIMEOUT
 
     def __init__(self, tap_handler=None):
-        super(ISOClass, self).__init__()
+        super().__init__()
 
         if tap_handler is None:
             self._tap = TapPlus(url=self.metadata_url)
diff --git a/astroquery/esa/xmm_newton/core.py b/astroquery/esa/xmm_newton/core.py
@@ -38,7 +38,7 @@ class XMMNewtonClass(BaseQuery):
     TIMEOUT = conf.TIMEOUT
 
     def __init__(self, tap_handler=None):
-        super(XMMNewtonClass, self).__init__()
+        super().__init__()
         self.configuration = configparser.ConfigParser()
 
         if tap_handler is None:
diff --git a/astroquery/esasky/core.py b/astroquery/esasky/core.py
@@ -80,7 +80,7 @@ class ESASkyClass(BaseQuery):
                  'DWARF_PLANET', 'SPACECRAFT', 'SPACEJUNK', 'EXOPLANET', 'STAR']
 
     def __init__(self, tap_handler=None):
-        super(ESASkyClass, self).__init__()
+        super().__init__()
 
         if tap_handler is None:
             self._tap = TapPlus(url=self.URLbase + "/tap")
diff --git a/astroquery/eso/core.py b/astroquery/eso/core.py
@@ -43,7 +43,7 @@ class EsoClass(QueryWithLogin):
     QUERY_INSTRUMENT_URL = conf.query_instrument_url
 
     def __init__(self):
-        super(EsoClass, self).__init__()
+        super().__init__()
         self._instrument_list = None
         self._survey_list = None
         self.username = None
diff --git a/astroquery/hips2fits/core.py b/astroquery/hips2fits/core.py
@@ -57,7 +57,7 @@ class hips2fitsClass(BaseQuery):
     timeout = conf.timeout
 
     def __init__(self, *args):
-        super(hips2fitsClass, self).__init__()
+        super().__init__()
 
     def query_with_wcs(self, hips, wcs, format="fits", min_cut=0.5, max_cut=99.5, stretch="linear", cmap="Greys_r", get_query_payload=False, verbose=False):
         """
diff --git a/astroquery/hitran/core.py b/astroquery/hitran/core.py
@@ -149,7 +149,7 @@ def __init__(self, **kwargs):
         """
         Initialize a Hitran query class.
         """
-        super(HitranClass, self).__init__()
+        super().__init__()
 
     def _args_to_payload(self, molecule_number=1, isotopologue_number=1,
                          min_frequency=None, max_frequency=None):
diff --git a/astroquery/jplhorizons/core.py b/astroquery/jplhorizons/core.py
@@ -89,7 +89,7 @@ def __init__(self, id=None, location=None, epochs=None,
         >>> print(eros)  # doctest: +SKIP
         JPLHorizons instance "433"; location=568, epochs={'start': '2017-01-01', 'step': '1d', 'stop': '2017-02-01'}, id_type=None
         """
-        super(HorizonsClass, self).__init__()
+        super().__init__()
         self.id = id
         self.location = location
 
diff --git a/astroquery/lamda/core.py b/astroquery/lamda/core.py
@@ -39,7 +39,7 @@ class LamdaClass(BaseQuery):
     url = "http://home.strw.leidenuniv.nl/~moldata/datafiles/{0}.dat"
 
     def __init__(self, **kwargs):
-        super(LamdaClass, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.moldict_path = os.path.join(self.cache_location,
                                          "molecules.json")
 
diff --git a/astroquery/mast/discovery_portal.py b/astroquery/mast/discovery_portal.py
@@ -129,7 +129,7 @@ class PortalAPI(BaseQuery):
 
     def __init__(self, session=None):
 
-        super(PortalAPI, self).__init__()
+        super().__init__()
         if session:
             self._session = session
 
diff --git a/astroquery/mpc/core.py b/astroquery/mpc/core.py
@@ -63,7 +63,7 @@ class MPCClass(BaseQuery):
     }
 
     def __init__(self):
-        super(MPCClass, self).__init__()
+        super().__init__()
 
     def query_object_async(self, target_type, get_query_payload=False, *args, **kwargs):
         """
diff --git a/astroquery/nasa_ads/core.py b/astroquery/nasa_ads/core.py
@@ -39,7 +39,7 @@ class ADSClass(BaseQuery):
 
     def __init__(self, *args):
         """ set some parameters """
-        super(ADSClass, self).__init__()
+        super().__init__()
 
     @class_or_instance
     def query_simple(self, query_string, get_query_payload=False,
diff --git a/astroquery/ogle/core.py b/astroquery/ogle/core.py
@@ -40,7 +40,7 @@ def wrapper(*args, **kwargs):
 class CoordParseError(ValueError):
 
     def __init__(self, message='Could not parse `coord` argument.', **kwargs):
-        super(ValueError, self).__init__(message, **kwargs)
+        super().__init__(message, **kwargs)
 
 
 @async_to_sync
diff --git a/astroquery/query.py b/astroquery/query.py
@@ -146,7 +146,7 @@ class LoginABCMeta(abc.ABCMeta):
     """
 
     def __new__(cls, name, bases, attrs):
-        newcls = super(LoginABCMeta, cls).__new__(cls, name, bases, attrs)
+        newcls = super().__new__(cls, name, bases, attrs)
 
         if '_login' in attrs and name not in ('BaseQuery', 'QueryWithLogin'):
             # skip theses two classes, BaseQuery and QueryWithLogin, so
@@ -473,7 +473,7 @@ class QueryWithLogin(BaseQuery):
     """
 
     def __init__(self):
-        super(QueryWithLogin, self).__init__()
+        super().__init__()
         self._authenticated = False
 
     def _get_password(self, service_name, username, reenter=False):
diff --git a/astroquery/simbad/tests/test_simbad.py b/astroquery/simbad/tests/test_simbad.py
@@ -40,7 +40,7 @@ class MockResponseSimbad(MockResponse):
 
     def __init__(self, script, cache=False, **kwargs):
         # preserve, e.g., headers
-        super(MockResponseSimbad, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.content = self.get_content(script)
 
     def get_content(self, script):
diff --git a/astroquery/skyview/core.py b/astroquery/skyview/core.py
@@ -20,7 +20,7 @@ class SkyViewClass(BaseQuery):
     URL = conf.url
 
     def __init__(self):
-        super(SkyViewClass, self).__init__()
+        super().__init__()
         self._default_form_values = None
 
     def _get_default_form_values(self, form):
diff --git a/astroquery/skyview/tests/test_skyview.py b/astroquery/skyview/tests/test_skyview.py
@@ -35,15 +35,15 @@ def fromname(self, name):
 
 class MockResponseSkyView(MockResponse):
     def __init__(self):
-        super(MockResponseSkyView, self).__init__()
+        super().__init__()
 
     def get_content(self):
         return self.content
 
 
 class MockResponseSkyviewForm(MockResponse):
     def __init__(self, method, url, cache=False, params=None, **kwargs):
-        super(MockResponseSkyviewForm, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.content = self.get_content(method, url)
 
     def get_content(self, method, url):
diff --git a/astroquery/splatalogue/core.py b/astroquery/splatalogue/core.py
@@ -65,7 +65,7 @@ def __init__(self, **kwargs):
         default keyword arguments (see `query_lines`) can be overridden
         here.
         """
-        super(SplatalogueClass, self).__init__()
+        super().__init__()
         self.data = self._default_kwargs()
         self.set_default_options(**kwargs)
 
diff --git a/astroquery/utils/commons.py b/astroquery/utils/commons.py
@@ -246,12 +246,12 @@ def __init__(self, inp):
                                  "or list of (k,v) pairs")
 
         self._dict = inp
-        super(TableList, self).__init__(inp.values())
+        super().__init__(inp.values())
 
     def __getitem__(self, key):
         if isinstance(key, int):
             # get the value in the (key,value) pair
-            return super(TableList, self).__getitem__(key)
+            return super().__getitem__(key)
         elif key in self._dict:
             return self._dict[key]
         else:
diff --git a/astroquery/vamdc/core.py b/astroquery/vamdc/core.py
@@ -23,7 +23,7 @@ class VamdcClass(BaseQuery):
     CACHE_LOCATION = conf.cache_location
 
     def __init__(self, doimport=True):
-        super(VamdcClass, self).__init__()
+        super().__init__()
 
         if not doimport:
             # this is a hack to allow the docstrings to be produced without
diff --git a/astroquery/vizier/core.py b/astroquery/vizier/core.py
@@ -74,7 +74,7 @@ def __init__(self, columns=["*"], column_filters={}, catalog=None,
             (This parameter's default is set from a configuration object.)
         """
 
-        super(VizierClass, self).__init__()
+        super().__init__()
         self.columns = columns
         self.column_filters = column_filters
         self.catalog = catalog
diff --git a/astroquery/vo_conesearch/conesearch.py b/astroquery/vo_conesearch/conesearch.py
@@ -76,7 +76,7 @@ class AsyncConeSearch(AsyncBase):
 
     """
     def __init__(self, *args, **kwargs):
-        super(AsyncConeSearch, self).__init__(conesearch, *args, **kwargs)
+        super().__init__(conesearch, *args, **kwargs)
 
 
 def conesearch(center, radius, *, verb=1, catalog_db=None,
diff --git a/astroquery/vo_conesearch/core.py b/astroquery/vo_conesearch/core.py
@@ -49,7 +49,7 @@ class ConeSearchClass(BaseQuery):
     """
 
     def __init__(self):
-        super(ConeSearchClass, self).__init__()
+        super().__init__()
 
     def query_region_async(self, *args, **kwargs):
         """
diff --git a/astroquery/vo_conesearch/vos_catalog.py b/astroquery/vo_conesearch/vos_catalog.py
@@ -99,7 +99,7 @@ class VOSCatalog(VOSBase):
     _compulsory_keys = ('title', 'url')
 
     def __init__(self, tree):
-        super(VOSCatalog, self).__init__(tree)
+        super().__init__(tree)
 
         for key in self._compulsory_keys:
             if key not in self._tree:
@@ -187,7 +187,7 @@ def __init__(self, tree):
         if 'catalogs' not in tree:
             raise VOSError("Invalid VO service catalog database")
 
-        super(VOSDatabase, self).__init__(tree)
+        super().__init__(tree)
         self._catalogs = tree['catalogs']
 
         if self.version > __dbversion__:  # pragma: no cover
diff --git a/astroquery/wfau/core.py b/astroquery/wfau/core.py
@@ -41,7 +41,7 @@ def __init__(self, username=None, password=None, community=None,
         """
         The BaseWFAUClass __init__ is meant to be overwritten
         """
-        super(BaseWFAUClass, self).__init__()
+        super().__init__()
         self.database = database
         self.programme_id = programme_id
         self.session = None
diff --git a/astroquery/xmatch/tests/test_xmatch.py b/astroquery/xmatch/tests/test_xmatch.py
@@ -21,7 +21,7 @@
 
 class MockResponseXmatch(MockResponse):
     def __init__(self, method, url, data, **kwargs):
-        super(MockResponseXmatch, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.data = data
         fn = data_path(DATA_FILES[method.lower()])
