From ab6e5056845a5572ebddf108355bcab11a9a5924 Mon Sep 17 00:00:00 2001 From: "Adam Ginsburg (keflavich)" Date: Wed, 14 Sep 2016 12:22:53 -0600 Subject: [PATCH 1/4] refactor splatalogue to use caching --- astroquery/splatalogue/core.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/astroquery/splatalogue/core.py b/astroquery/splatalogue/core.py index 33540a6737..91ca68ef85 100644 --- a/astroquery/splatalogue/core.py +++ b/astroquery/splatalogue/core.py @@ -355,7 +355,7 @@ def _validate_kwargs(self, min_frequency=None, max_frequency=None, @prepend_docstr_noreturns("\n" + _parse_kwargs.__doc__) def query_lines_async(self, min_frequency=None, max_frequency=None, - **kwargs): + cache=True, **kwargs): """ Returns @@ -385,10 +385,11 @@ def query_lines_async(self, min_frequency=None, max_frequency=None, if get_query_payload: return data_payload - response = commons.send_request( - self.QUERY_URL, - data_payload, - self.TIMEOUT) + response = self._request(method='POST', + url=self.QUERY_URL, + data=data_payload, + timeout=self.TIMEOUT, + cache=cache) self.response = response From c73bf86fdbd416d676f2e7dbf004358349d0bf12 Mon Sep 17 00:00:00 2001 From: "Adam Ginsburg (keflavich)" Date: Wed, 14 Sep 2016 12:24:23 -0600 Subject: [PATCH 2/4] remove unnecessary import --- astroquery/splatalogue/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astroquery/splatalogue/core.py b/astroquery/splatalogue/core.py index 91ca68ef85..079dadd412 100644 --- a/astroquery/splatalogue/core.py +++ b/astroquery/splatalogue/core.py @@ -9,7 +9,7 @@ from astropy.io import ascii from astropy import units as u from ..query import BaseQuery -from ..utils import commons, async_to_sync +from ..utils import async_to_sync from ..utils.docstr_chompers import prepend_docstr_noreturns from . import conf from . import load_species_table From d1c518dc31f5705de741bf9ddd449106fd98d9fe Mon Sep 17 00:00:00 2001 From: "Adam Ginsburg (keflavich)" Date: Wed, 14 Sep 2016 12:37:52 -0600 Subject: [PATCH 3/4] superinit --- astroquery/splatalogue/core.py | 1 + 1 file changed, 1 insertion(+) diff --git a/astroquery/splatalogue/core.py b/astroquery/splatalogue/core.py index 079dadd412..422edb0bfa 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) From d0feb3a95225de361426de3d9be96d136e93e30b Mon Sep 17 00:00:00 2001 From: "Adam Ginsburg (keflavich)" Date: Fri, 16 Sep 2016 18:40:43 -0600 Subject: [PATCH 4/4] fix splatalogue local test monkeypatches --- astroquery/splatalogue/tests/test_splatalogue.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/astroquery/splatalogue/tests/test_splatalogue.py b/astroquery/splatalogue/tests/test_splatalogue.py index 0ae2b3810a..acda1a9529 100644 --- a/astroquery/splatalogue/tests/test_splatalogue.py +++ b/astroquery/splatalogue/tests/test_splatalogue.py @@ -17,11 +17,14 @@ def data_path(filename): @pytest.fixture def patch_post(request): mp = request.getfuncargvalue("monkeypatch") - mp.setattr(requests, 'post', post_mockreturn) + mp.setattr(requests.Session, 'request', post_mockreturn) return mp -def post_mockreturn(url, data=None, timeout=10, **kwargs): +def post_mockreturn(self, method, url, data=None, timeout=10, files=None, + params=None, headers=None, **kwargs): + if method != 'POST': + raise ValueError("A 'post request' was made with method != POST") filename = data_path(SPLAT_DATA) content = open(filename, "rb").read() return MockResponse(content, **kwargs)