cleanup after rebase

Author: ceb8

astroquery/__init__.py

@@ -54,7 +54,7 @@ def _get_bibtex():
 class Conf(_config.ConfigNamespace):
 
     default_cache_timeout = _config.ConfigItem(
-          86400,  # 24 hours
+          604800 ,  # 1 week
           'Astroquery-wide default cache timeout (seconds).'
           )
     cache_location = _config.ConfigItem(

astroquery/query.py

@@ -10,22 +10,20 @@
 import keyring
 import io
 import os
-import warnings
 import requests
 import textwrap
 
 from datetime import datetime, timedelta
 from pathlib import Path
 
 from astropy.config import paths
-from astroquery import log
 import astropy.units as u
 from astropy.utils.console import ProgressBarOrSpinner
 import astropy.utils.data
 
-from . import version
-from .utils import system_tools
-from astroquery import conf
+from astroquery import version, log, conf
+from astroquery.utils import system_tools
+
 
 __all__ = ['BaseQuery', 'QueryWithLogin']
 
@@ -133,7 +131,7 @@ def from_cache(self, cache_location, cache_timeout):
             else:
                 log.debug("Cache expired for {0}...".format(request_file))
                 response = None
-        except IOError:  # TODO: change to FileNotFoundError once drop py2 support
+        except FileNotFoundError:
             response = None
         if response:
             log.debug("Retrieved data from {0}".format(request_file))
@@ -201,7 +199,6 @@ def __init__(self):
 
         self.name = self.__class__.__name__.split("Class")[0]
         self._cache_active = conf.use_cache
-        self.use_cache = conf.use_cache
         self.cache_timeout = conf.default_cache_timeout
 
 
@@ -257,7 +254,7 @@ def reset_cache_preferences(self):
             conf.cache_location,
             self.__class__.__name__.split("Class")[0])
 
-        self.use_cache = conf.use_cache
+        self._cache_active = conf.use_cache
         self.cache_timeout = conf.default_cache_timeout
 
     def _request(self, method, url,
@@ -330,7 +327,7 @@ def _request(self, method, url,
             json=json
         )
 
-        if (cache is not False) and self.use_cache:
+        if (cache is not False) and self._cache_active:
             cache = True
         else:
             cache = False

astroquery/setup_package.py

@@ -3,4 +3,3 @@
 
 def get_package_data():
     return {'astroquery': ['CITATION']}
-