renaming cache config class

Author: ceb8

astroquery/__init__.py

@@ -42,7 +42,7 @@ def _get_bibtex():
 
 
 # Set up cache configuration
-class Conf(_config.ConfigNamespace):
+class Cache_Conf(_config.ConfigNamespace):
 
     cache_timeout = _config.ConfigItem(
         604800,  # 1 week
@@ -57,4 +57,4 @@ class Conf(_config.ConfigNamespace):
     )
 
 
-conf = Conf()
+cache_conf = Cache_Conf()

astroquery/query.py

@@ -21,7 +21,7 @@
 from astropy.utils import deprecated
 from astropy.utils.exceptions import AstropyDeprecationWarning
 
-from astroquery import version, log, conf
+from astroquery import version, log, cache_conf
 from astroquery.utils import system_tools
 
 
@@ -311,7 +311,7 @@ def _request(self, method, url,
             is True.
         """
 
-        cache &= conf.cache_active
+        cache &= cache_conf.cache_active
 
         if save:
             local_filename = url.split('/')[-1]
@@ -335,13 +335,13 @@ def _request(self, method, url,
             query = AstroQuery(method, url, params=params, data=data, headers=headers,
                                files=files, timeout=timeout, json=json)
             if (self.cache_location is None) or (not cache):
-                with conf.set_temp("cache_active", False):
+                with cache_conf.set_temp("cache_active", False):
                     response = query.request(self._session, stream=stream,
                                              auth=auth, verify=verify,
                                              allow_redirects=allow_redirects,
                                              json=json)
             else:
-                response = query.from_cache(self.cache_location, conf.cache_timeout)
+                response = query.from_cache(self.cache_location, cache_conf.cache_timeout)
                 if not response:
                     response = query.request(self._session,
                                              self.cache_location,
@@ -485,7 +485,7 @@ class suspend_cache:
     """
 
     def __init__(self, obj=None):
-        self.original_cache_setting = conf.cache_active
+        self.original_cache_setting = cache_conf.cache_active
 
     def __enter__(self):
         conf.cache_active = False