integrating better with astropy config framework

Author: ceb8

astroquery/query.py

@@ -338,7 +338,7 @@ def _request(self, method, url,
                 # ":" so replace them with an underscore
                 local_filename = local_filename.replace(':', '_')
 
-            local_filepath = os.path.join(savedir or self.cache_location or '.', local_filename)
+            local_filepath = os.path.join(savedir or self._cache_location or '.', local_filename)
 
             response = self._download_file(url, local_filepath, cache=cache, timeout=timeout,
                                            continuation=continuation, method=method,
@@ -361,15 +361,16 @@ def _request(self, method, url,
                                              json=json)
             else:
                 response = query.from_cache(self.cache_location, cache_conf.cache_timeout)
+
                 if not response:
                     response = query.request(self._session,
-                                             self.cache_location,
+                                             self._cache_location,
                                              stream=stream,
                                              auth=auth,
                                              allow_redirects=allow_redirects,
                                              verify=verify,
                                              json=json)
-                    to_cache(response, query.request_file(self.cache_location))
+                    to_cache(response, query.request_file(self._cache_location))
 
             self._last_query = query
             return response
@@ -514,6 +515,7 @@ def __exit__(self, exc_type, exc_value, traceback):
         return False
 
 
+
 class QueryWithLogin(BaseQuery):
     """
     This is the base class for all the query classes which are required to

astroquery/tests/test_cache.py

@@ -10,6 +10,7 @@
 from astroquery.query import QueryWithLogin
 from astroquery import cache_conf
 
+
 URL1 = "http://fakeurl.edu"
 URL2 = "http://fakeurl.ac.uk"
 
@@ -82,22 +83,22 @@ def test_basic_caching(changing_mocked_response):
     assert cache_conf.cache_active
 
     mytest.clear_cache()
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     resp = mytest.test_func(URL1)
     assert resp.content == TEXT1
-    assert len(os.listdir(mytest.cache_location)) == 1
+    assert len(os.listdir(mytest.get_cache_location())) == 1
 
     resp = mytest.test_func(URL2)  # query that has not been cached
     assert resp.content == TEXT2
-    assert len(os.listdir(mytest.cache_location)) == 2
+    assert len(os.listdir(mytest.get_cache_location())) == 2
 
     resp = mytest.test_func(URL1)
     assert resp.content == TEXT1  # query that was cached
-    assert len(os.listdir(mytest.cache_location)) == 2  # no new cache file
+    assert len(os.listdir(mytest.get_cache_location())) == 2  # no new cache file
 
     mytest.clear_cache()
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     resp = mytest.test_func(URL1)
     assert resp.content == TEXT2  # Now get new response
@@ -134,11 +135,11 @@ def test_login(changing_mocked_response):
     assert cache_conf.cache_active
 
     mytest.clear_cache()
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     mytest.login("ceb")
     assert mytest.authenticated()
-    assert len(os.listdir(mytest.cache_location)) == 0  # request should not be cached
+    assert len(os.listdir(mytest.get_cache_location())) == 0  # request should not be cached
 
     mytest.login("ceb")
     assert not mytest.authenticated()  # Should not be accessing cache
@@ -151,7 +152,7 @@ def test_timeout(changing_mocked_response, monkeypatch):
     assert cache_conf.cache_active
 
     mytest.clear_cache()
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     resp = mytest.test_func(URL1)  # should be cached
     assert resp.content == TEXT1
@@ -183,11 +184,11 @@ def test_deactivate_directly(changing_mocked_response):
     cache_conf.cache_active = False
 
     mytest.clear_cache()
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     resp = mytest.test_func(URL1)
     assert resp.content == TEXT1
-    assert len(os.listdir(mytest.cache_location)) == 0
+    assert len(os.listdir(mytest.get_cache_location())) == 0
 
     resp = mytest.test_func(URL1)
     assert resp.content == TEXT2