From 462fd04a33eb887531e99bef51f938ea2fe247ab Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Fri, 13 Mar 2015 15:33:56 +0100 Subject: [PATCH 1/6] adapt to changing astropy Config API --- astroquery/irsa_dust/__init__.py | 2 +- astroquery/magpis/__init__.py | 2 +- astroquery/ned/__init__.py | 35 +++++++++++++------------- astroquery/nist/__init__.py | 2 +- astroquery/nrao/__init__.py | 2 +- astroquery/nvas/__init__.py | 2 +- astroquery/ogle/__init__.py | 2 +- astroquery/sdss/__init__.py | 2 +- astroquery/simbad/__init__.py | 3 ++- astroquery/template_module/__init__.py | 7 +++--- astroquery/ukidss/__init__.py | 2 +- astroquery/utils/commons.py | 2 +- astroquery/vizier/__init__.py | 19 +++++++------- 13 files changed, 43 insertions(+), 39 deletions(-) diff --git a/astroquery/irsa_dust/__init__.py b/astroquery/irsa_dust/__init__.py index 31943f6a00..b160c90b40 100644 --- a/astroquery/irsa_dust/__init__.py +++ b/astroquery/irsa_dust/__init__.py @@ -18,7 +18,7 @@ class Conf(_config.ConfigNamespace): """ # maintain a list of URLs in case the user wants to append a mirror server = _config.ConfigItem( - ['http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust'], + 'http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust', 'Name of the irsa_dust server to use.' ) timeout = _config.ConfigItem( diff --git a/astroquery/magpis/__init__.py b/astroquery/magpis/__init__.py index 5185a12630..f227d3b4ae 100644 --- a/astroquery/magpis/__init__.py +++ b/astroquery/magpis/__init__.py @@ -19,7 +19,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.magpis`. """ server = _config.ConfigItem( - ['http://third.ucllnl.org/cgi-bin/gpscutout'], + 'http://third.ucllnl.org/cgi-bin/gpscutout', 'Name of the MAGPIS server.' ) timeout = _config.ConfigItem( diff --git a/astroquery/ned/__init__.py b/astroquery/ned/__init__.py index 4106e16f6c..fdbb8d2a86 100644 --- a/astroquery/ned/__init__.py +++ b/astroquery/ned/__init__.py @@ -31,7 +31,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.ned`. """ server = _config.ConfigItem( - ['http://ned.ipac.caltech.edu/cgi-bin/'], + 'http://ned.ipac.caltech.edu/cgi-bin/', 'Name of the NED server to use.' ) timeout = _config.ConfigItem( @@ -55,30 +55,31 @@ class Conf(_config.ConfigNamespace): (4) To the Reference Frame defined by the (Virgo + GA + Shapley) """ correct_redshift = _config.ConfigItem( - [1, 2, 3, 4], - 'The correct redshift for NED queries, see comments above..' + defaultvalue=1, + description='The correct redshift for NED queries, see comments above..', + #cfgtype=[1, 2, 3, 4], ) # Set output parameters of choice output_coordinate_frame = _config.ConfigItem( - ['Equatorial', - 'Ecliptic', - 'Galactic', - 'SuperGalactic'], - 'Frame in which to display the coordinates in the output.' + defaultvalue='Equatorial', + description='Frame in which to display the coordinates in the output.', + #cfgtype=['Equatorial', 'Ecliptic', 'Galactic', 'SuperGalactic'] ) output_equinox = _config.ConfigItem( - ['J2000.0', 'B1950.0'], - 'Equinox for the output coordinates.' + defaultvalue='J2000.0', + description='Equinox for the output coordinates.', + #['J2000.0', 'B1950.0'], ) sort_output_by = _config.ConfigItem( - ["RA or Longitude", - "DEC or Latitude", - "GLON", - "GLAT", - "Redshift - ascending", - "Redshift - descending"], - 'Display output sorted by this criteria.' + defaultvalue="RA or Longitude", + description='Display output sorted by this criteria.', + #["RA or Longitude", + # "DEC or Latitude", + # "GLON", + # "GLAT", + # "Redshift - ascending", + # "Redshift - descending"], ) conf = Conf() diff --git a/astroquery/nist/__init__.py b/astroquery/nist/__init__.py index b1593ffcae..408364e218 100644 --- a/astroquery/nist/__init__.py +++ b/astroquery/nist/__init__.py @@ -10,7 +10,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.nist`. """ server = _config.ConfigItem( - ['http://physics.nist.gov/cgi-bin/ASD/lines1.pl'], + 'http://physics.nist.gov/cgi-bin/ASD/lines1.pl', 'Name of the NIST URL to query.' ) timeout = _config.ConfigItem( diff --git a/astroquery/nrao/__init__.py b/astroquery/nrao/__init__.py index 46dbd3b036..0f2364bcce 100644 --- a/astroquery/nrao/__init__.py +++ b/astroquery/nrao/__init__.py @@ -10,7 +10,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.nrao`. """ server = _config.ConfigItem( - ['https://archive.nrao.edu/archive/ArchiveQuery'], + 'https://archive.nrao.edu/archive/ArchiveQuery', 'Name of the NRAO mirror to use.' ) timeout = _config.ConfigItem( diff --git a/astroquery/nvas/__init__.py b/astroquery/nvas/__init__.py index 7ddf7e82a2..ec277c0206 100644 --- a/astroquery/nvas/__init__.py +++ b/astroquery/nvas/__init__.py @@ -16,7 +16,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.nvas`. """ server = _config.ConfigItem( - ['https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl'], + 'https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl', 'Name of the NVAS mirror to use.' ) timeout = _config.ConfigItem( diff --git a/astroquery/ogle/__init__.py b/astroquery/ogle/__init__.py index 96d6336e13..ef3f774a77 100644 --- a/astroquery/ogle/__init__.py +++ b/astroquery/ogle/__init__.py @@ -21,7 +21,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.ogle`. """ server = _config.ConfigItem( - ['http://ogle.astrouw.edu.pl/cgi-ogle/getext.py'], + 'http://ogle.astrouw.edu.pl/cgi-ogle/getext.py', 'Name of the OGLE mirror to use.' ) timeout = _config.ConfigItem( diff --git a/astroquery/sdss/__init__.py b/astroquery/sdss/__init__.py index 2d40893233..91724665bc 100644 --- a/astroquery/sdss/__init__.py +++ b/astroquery/sdss/__init__.py @@ -13,7 +13,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.sdss`. """ server = _config.ConfigItem( - ['http://data.sdss3.org/sas/dr12'], + 'http://data.sdss3.org/sas/dr12', 'Link to SDSS website.' ) timeout = _config.ConfigItem( diff --git a/astroquery/simbad/__init__.py b/astroquery/simbad/__init__.py index eeaeedb144..a6d82b871d 100644 --- a/astroquery/simbad/__init__.py +++ b/astroquery/simbad/__init__.py @@ -16,8 +16,9 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.simbad`. """ server = _config.ConfigItem( - ['simbad.u-strasbg.fr', 'simbad.harvard.edu'], + 'simbad.u-strasbg.fr', 'Name of the SIMBAD mirror to use.' + #['simbad.u-strasbg.fr', 'simbad.harvard.edu'], ) timeout = _config.ConfigItem( 60, diff --git a/astroquery/template_module/__init__.py b/astroquery/template_module/__init__.py index a94ebb1294..76f6a8b676 100644 --- a/astroquery/template_module/__init__.py +++ b/astroquery/template_module/__init__.py @@ -19,10 +19,11 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.template_module`. """ server = _config.ConfigItem( - ['http://dummy_server_mirror_1', - 'http://dummy_server_mirror_2', - 'http://dummy_server_mirror_n'], + 'http://dummy_server_mirror_1', 'Name of the template_module server to use.' + #['http://dummy_server_mirror_1', + # 'http://dummy_server_mirror_2', + # 'http://dummy_server_mirror_n'], ) timeout = _config.ConfigItem( 30, diff --git a/astroquery/ukidss/__init__.py b/astroquery/ukidss/__init__.py index 3c6ec9a6ad..1ec0eec2c8 100644 --- a/astroquery/ukidss/__init__.py +++ b/astroquery/ukidss/__init__.py @@ -20,7 +20,7 @@ class Conf(_config.ConfigNamespace): Configuration parameters for `astroquery.ukidss`. """ server = _config.ConfigItem( - ['http://surveys.roe.ac.uk:8080/wsa/'], + 'http://surveys.roe.ac.uk:8080/wsa/', 'Name of the UKIDSS mirror to use.' ) timeout = _config.ConfigItem( diff --git a/astroquery/utils/commons.py b/astroquery/utils/commons.py index 34544894f9..a265bb43b8 100644 --- a/astroquery/utils/commons.py +++ b/astroquery/utils/commons.py @@ -367,7 +367,7 @@ class FileContainer(object): def __init__(self, target, **kwargs): kwargs.setdefault('cache', True) self._target = target - self._timeout = kwargs.get('remote_timeout', aud.REMOTE_TIMEOUT()) + self._timeout = kwargs.get('remote_timeout', aud.conf.remote_timeout) if (os.path.splitext(target)[1] == '.fits' and not ('encoding' in kwargs and kwargs['encoding'] == 'binary')): warnings.warn("FITS files must be read as binaries; error is likely.") diff --git a/astroquery/vizier/__init__.py b/astroquery/vizier/__init__.py index 509edb05d7..20088f6820 100644 --- a/astroquery/vizier/__init__.py +++ b/astroquery/vizier/__init__.py @@ -22,16 +22,17 @@ class Conf(_config.ConfigNamespace): """ server = _config.ConfigItem( - ['vizier.u-strasbg.fr', - 'vizier.nao.ac.jp', - 'vizier.hia.nrc.ca', - 'vizier.ast.cam.ac.uk', - 'vizier.cfa.harvard.edu', - 'www.ukirt.jach.hawaii.edu', - 'vizier.iucaa.ernet.in', - 'vizier.china-vo.org', - ], + 'vizier.u-strasbg.fr', 'Name of the VizieR mirror to use.' + #['vizier.u-strasbg.fr', + # 'vizier.nao.ac.jp', + # 'vizier.hia.nrc.ca', + # 'vizier.ast.cam.ac.uk', + # 'vizier.cfa.harvard.edu', + # 'www.ukirt.jach.hawaii.edu', + # 'vizier.iucaa.ernet.in', + # 'vizier.china-vo.org', + # ], ) timeout = _config.ConfigItem( 60, From 8d1be0f8cea93216b8f41e2a5cb6973bd29363bd Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Wed, 25 Mar 2015 22:41:10 +0100 Subject: [PATCH 2/6] simbad: with configurations working properly, the query limit is now used --- astroquery/simbad/tests/test_simbad.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/astroquery/simbad/tests/test_simbad.py b/astroquery/simbad/tests/test_simbad.py index 5c2bc58977..f2e44befdf 100644 --- a/astroquery/simbad/tests/test_simbad.py +++ b/astroquery/simbad/tests/test_simbad.py @@ -125,19 +125,19 @@ def test_parse_result(): [([ICRS_COORDS], dict(radius=5.0 * u.deg, frame='ICRS', equinox=2000.0, epoch='J2000', caller='query_region_async'), - ("\nvotable {" + votable_fields + "}\n" + ("set limit 50\nvotable {" + votable_fields + "}\n" "votable open\n" "query coo 5:35:17.3 -80:52:00 " "radius=5d frame=ICRS equi=2000.0 epoch=J2000 \n" "votable close")), (["m [0-9]"], dict(wildcard=True, caller='query_object_async'), - ("\nvotable {" + votable_fields + "}\n" + ("set limit 50\nvotable {" + votable_fields + "}\n" "votable open\n" "query id wildcard m [0-9] \n" "votable close" )), (["2006ApJ"], dict(caller='query_bibcode_async', get_raw=True), - ("\n\n\nquery bibcode 2006ApJ \n")) + ("set limit 50\n\n\nquery bibcode 2006ApJ \n")) ]) def test_args_to_payload(args, kwargs, expected_script): script = simbad.Simbad._args_to_payload(*args, **kwargs)['script'] From ac955ca60dfb46947ec89484c3c8a893d4a3ee9f Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Wed, 25 Mar 2015 22:59:29 +0100 Subject: [PATCH 3/6] include Conf in all for atomic --- astroquery/atomic/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/astroquery/atomic/__init__.py b/astroquery/atomic/__init__.py index 3620c299f9..f4c79237df 100644 --- a/astroquery/atomic/__init__.py +++ b/astroquery/atomic/__init__.py @@ -88,4 +88,5 @@ class Conf(_config.ConfigNamespace): from .core import AtomicLineList, AtomicLineListClass -__all__ = ['AtomicLineList', 'AtomicLineListClass', 'Transition', 'conf'] +__all__ = ['AtomicLineList', 'AtomicLineListClass', 'Transition', 'conf', + 'Conf'] From b638da5e060a993e45607906619514529252f3ee Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Thu, 26 Mar 2015 09:13:34 +0100 Subject: [PATCH 4/6] add "pristine" astroquery.cfg with all options commented out --- astroquery/astroquery.cfg | 197 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 astroquery/astroquery.cfg diff --git a/astroquery/astroquery.cfg b/astroquery/astroquery.cfg new file mode 100644 index 0000000000..9a4a66fbed --- /dev/null +++ b/astroquery/astroquery.cfg @@ -0,0 +1,197 @@ +[besancon] + +# Besancon download URL. Changed to modele2003 in 2013. +# Options: ftp://sasftp.obs-besancon.fr/modele/modele2003/, ftp://sasftp.obs-besancon.fr/modele/ +#besancon_download_url = ftp://sasftp.obs-besancon.fr/modele/modele2003/ + +# Besancon model form URL +# Options: http://model.obs-besancon.fr/modele_form.php +#besancon_model_Form = http://model.obs-besancon.fr/modele_form.php + +# Amount of time before pinging the Besancon server to see if the file is +# ready. Minimum 30s. +#besancon_ping_delay = 30.0 + +# Timeout for Besancon query +#besancon_timeout = 30.0 + +[eso] + +# maximum number of rows returned (set to -1 for unlimited). +#row_limit = 50 + +[fermi] + +# Fermi query URL +# Options: http://fermi.gsfc.nasa.gov/cgi-bin/ssc/LAT/LATDataQuery.cgi +#fermi_url = http://fermi.gsfc.nasa.gov/cgi-bin/ssc/LAT/LATDataQuery.cgi + +# time limit for connecting to FERMI server +#timeout = 60 + +# time limit for retrieving a data file once it has been located +#retrieval_timeout = 120 + +[irsa] + +# Name of the IRSA mirror to use. +# Options: http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-query +#irsa_server = http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-query + +# URL from which to list all the public catalogs in IRSA. +# Options: http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-scan +#gator_list_catalogs = http://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-scan + +# maximum number of rows to retrieve in result +#row_limit = 500 + +# time limit for connecting to the IRSA server +#timeout = 60 + +[irsa_dust] + +# Name of the irsa_dust server to use +# Options: http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust +#irsa_dust_server = http://irsa.ipac.caltech.edu/cgi-bin/DUST/nph-dust + +# default timeout for connecting to server +#timeout = 30 + +[magpis] + +# Name of the MAGPIS server. +# Options: http://third.ucllnl.org/cgi-bin/gpscutout +#magpis_server = http://third.ucllnl.org/cgi-bin/gpscutout + +# time limit for connecting to MAGPIS server +#timeout = 60 + +[ned] + +# Name of the NED mirror to use. +# Options: http://ned.ipac.caltech.edu/cgi-bin/ +#ned_server = http://ned.ipac.caltech.edu/cgi-bin/ + +# time limit for connecting to NED server +#timeout = 60 + +# value of the Hubble Constant for many NED queries. +# Options: 73, 70.5 +#hubble_constant = 73 + +# the correct redshift for NED queries, see comments above. +# Options: 1, 2, 3, 4 +#correct_redshift = 1 + +# Frame in which to display the coordinates in the output. +# Options: Equatorial, Ecliptic, Galactic, SuperGalactic +#output_coordinate_frame = Equatorial + +# Equinox for the output coordinates. +# Options: J2000.0, B1950.0 +#output_equinox = J2000.0 + +# display output sorted by this criteria. +# Options: RA or Longitude, DEC or Latitude, GLON, GLAT, Redshift - ascending, Redshift - descending +#sort_output_by = RA or Longitude + +[nist] + +# Name of the NIST URL to query. +# Options: http://physics.nist.gov/cgi-bin/ASD/lines1.pl +#nist_server = http://physics.nist.gov/cgi-bin/ASD/lines1.pl + +# time limit for connecting to NIST server +#timeout = 30 + +[nrao] + +# Name of the NRAO mirror to use. +# Options: https://archive.nrao.edu/archive/ArchiveQuery +#nrao_server = https://archive.nrao.edu/archive/ArchiveQuery + +# time limit for connecting to NRAO server +#timeout = 60 + +[nvas] + +# Name of the NVAS mirror to use. +# Options: https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl +#nvas_server = https://webtest.aoc.nrao.edu/cgi-bin/lsjouwer/archive-pos.pl + +# time limit for connecting to NVAS server +#timeout = 60 + +[ogle] + +# Name of the OGLE mirror to use. +# Options: http://ogle.astrouw.edu.pl/cgi-ogle/getext.py +#ogle_server = http://ogle.astrouw.edu.pl/cgi-ogle/getext.py + +# Time limit for connecting to the OGLE server. +#timeout = 60 + +[sdss] + +# Link to SDSS website. +#sdss_server = http://data.sdss3.org/sas/dr10 + +# Max number of queries allowed per second +#maxqueries = 1 + +# Default timeout for connecting to server +#timeout = 30 + +[simbad] + +# Name of the SIMBAD mirror to use. +# Options: simbad.u-strasbg.fr, simbad.harvard.edu +#simbad_server = simbad.u-strasbg.fr + +# time limit for connecting to Simbad server +#timeout = 60 + +# maximum number of rows that will be fetched from the result. +#row_limit = 0 + +[splatalogue] + +#Splatalogue SLAP interface URL (not used). = http://find.nrao.edu/splata-slap/slap + +#Splatalogue web interface URL. = http://www.cv.nrao.edu/php/splat/c_export.php + +# default timeout for connecting to server +#timeout = 60 + +#Limit to number of lines exported = 10000 + +[template_module] + +# put a brief description of the item here +# Options: http://dummy_server_mirror_1, http://dummy_server_mirror_2, http://dummy_server_mirror_n +#server = http://dummy_server_mirror_1 + +# default timeout for connecting to server +#timeout = 30 + +[ukidss] + +# Name of the UKIDSS mirror to use. +# Options: http://surveys.roe.ac.uk:8080/wsa/ +#ukidss_server = http://surveys.roe.ac.uk:8080/wsa/ + +# time limit for connecting to UKIDSS server +#timeout = 60 + +[vizier] + +# Name of the VizieR mirror to use. +# Options: vizier.u-strasbg.fr, vizier.nao.ac.jp, vizier.hia.nrc.ca, vizier.ast.cam.ac.uk, vizier.cfa.harvard.edu, www.ukirt.jach.hawaii.edu, vizier.iucaa.ernet.in, vizier.china-vo.org +#vizier_server = vizier.u-strasbg.fr + +# default timeout for connecting to server +#timeout = 60 + +# maximum number of rows that will be fetched from the result (set to -1 for +# unlimited). +#row_limit = 50 From e47a9c3ec923e05efc347f79a8938a13396ee64f Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Thu, 26 Mar 2015 09:15:10 +0100 Subject: [PATCH 5/6] added setup_package to include astroquery.cfg --- astroquery/setup_package.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 astroquery/setup_package.py diff --git a/astroquery/setup_package.py b/astroquery/setup_package.py new file mode 100644 index 0000000000..5aed6c65f6 --- /dev/null +++ b/astroquery/setup_package.py @@ -0,0 +1,4 @@ +# Licensed under a 3-clause BSD style license - see LICENSE.rst + +def get_package_data(): + return {'astroquery': ['astroquery.cfg']} From 30b1601f3ed7f2e4af0e069b3bdc9b08374b2e6b Mon Sep 17 00:00:00 2001 From: Adam Ginsburg Date: Thu, 26 Mar 2015 14:17:17 +0100 Subject: [PATCH 6/6] cleanup to attempt a fix. Still no idea how cosmosim and splatalogue are crosstalking --- astroquery/cosmosim/__init__.py | 4 ++-- astroquery/cosmosim/core.py | 2 -- astroquery/skyview/core.py | 2 +- astroquery/splatalogue/core.py | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/astroquery/cosmosim/__init__.py b/astroquery/cosmosim/__init__.py index 329fb4fcf5..a3670b2829 100644 --- a/astroquery/cosmosim/__init__.py +++ b/astroquery/cosmosim/__init__.py @@ -18,11 +18,11 @@ class Conf(_config.ConfigNamespace): """ query_url = _config.ConfigItem( - ['http://www.cosmosim.org/uws/query'], + 'http://www.cosmosim.org/uws/query', 'CosmoSim UWS query URL' ) schema_url = _config.ConfigItem( - ['http://www.cosmosim.org/query/account/databases/json'], + 'http://www.cosmosim.org/query/account/databases/json', 'CosmoSim json query URL for generating database schema' ) timeout = _config.ConfigItem( diff --git a/astroquery/cosmosim/core.py b/astroquery/cosmosim/core.py index 51a5eb7f16..e924b16bfc 100644 --- a/astroquery/cosmosim/core.py +++ b/astroquery/cosmosim/core.py @@ -40,14 +40,12 @@ class CosmoSimClass(QueryWithLogin): def __init__(self): super(CosmoSimClass, self).__init__() - #self.session = self._BaseQuery__session def _login(self, username, password=None, store_password=False): # login after logging out (interactive) if not hasattr(self,'session'): self.session = requests.session() - #self._BaseQuery__session = self.session # NOTE FROM AG: I hope this works... # login after login (interactive) if hasattr(self,'username'): diff --git a/astroquery/skyview/core.py b/astroquery/skyview/core.py index c199da7372..cdf45930c1 100644 --- a/astroquery/skyview/core.py +++ b/astroquery/skyview/core.py @@ -19,7 +19,7 @@ class SkyViewClass(BaseQuery): URL = conf.url def __init__(self): - BaseQuery.__init__(self) + super(SkyViewClass, self).__init__() self._default_form_values = None def _get_default_form_values(self, form): diff --git a/astroquery/splatalogue/core.py b/astroquery/splatalogue/core.py index c1aac07065..ce30d24b8c 100644 --- a/astroquery/splatalogue/core.py +++ b/astroquery/splatalogue/core.py @@ -63,6 +63,7 @@ def __init__(self, **kwargs): default keyword arguments (see `query_lines`) can be overridden here. """ + super(SplatalogueClass, self).__init__() self.data = self._default_kwargs() self.set_default_options(**kwargs)