Merge pull request #490 from keflavich/user-agent

HTTP user-agent should be astroquery

Author: keflavich

astroquery/query.py

@@ -14,6 +14,8 @@
 from astropy.utils.console import ProgressBar
 import astropy.utils.data
 
+from . import version
+
 __all__ = ['BaseQuery', 'QueryWithLogin']
 
 
@@ -96,7 +98,10 @@ class BaseQuery(object):
     """
 
     def __init__(self):
-        self._session = requests.session()
+        S = self._session = requests.session()
+        S.headers['User-Agent'] = ('astroquery/{vers} {olduseragent}'
+                                   .format(vers=version.version,
+                                           olduseragent=S.headers['User-Agent']))
         self.cache_location = os.path.join(paths.get_cache_dir(), 'astroquery',
                                            self.__class__.__name__.split("Class")[0])
         if not os.path.exists(self.cache_location):

astroquery/simbad/core.py

@@ -115,6 +115,7 @@ class SimbadClass(BaseQuery):
     _VOTABLE_FIELDS = ['main_id', 'coordinates']
 
     def __init__(self):
+        super(SimbadClass, self).__init__()
         self._VOTABLE_FIELDS = copy.copy(self._VOTABLE_FIELDS)
 
     def list_wildcards(self):

docs/conf.py

@@ -181,7 +181,7 @@ def __getattr__(cls, name):
         else:
             return Mock()
 
-MOCK_MODULES = ['atpy', 'beautifulsoup4', 'vo', 'requests', 'lxml', 'keyring', 'bs4']
+MOCK_MODULES = ['atpy', 'beautifulsoup4', 'vo', 'lxml', 'keyring', 'bs4']
 for mod_name in MOCK_MODULES:
     sys.modules[mod_name] = Mock()