Making user-agent consistent with pyvo

Author: bsipocz

astroquery/mast/utils.py

@@ -76,8 +76,8 @@ def _simple_request(url, params):
     """
 
     session = requests.session()
-    old_user_agent = session.headers['User-Agent']
-    headers = {"User-Agent": f"astroquery/{version} ({platform.system()} {platform.python_version()}) {old_user_agent}",
+    headers = {"User-Agent": (f"astroquery/{version} Python/{platform.python_version()} ({platform.system()}) "
+                              f"{session.headers['User-Agent']}"),
                "Content-type": "application/x-www-form-urlencoded",
                "Accept": "text/plain"}
 

astroquery/query.py

@@ -185,7 +185,8 @@ def __init__(self):
         S = self._session = requests.Session()
         self._session.hooks['response'].append(self._response_hook)
         S.headers['User-Agent'] = (
-            f"astroquery/{version.version} ({platform.system()} {platform.python_version()}) {S.headers['User-Agent']}")
+            f"astroquery/{version.version} Python/{platform.python_version()} ({platform.system()}) "
+            f"{S.headers['User-Agent']}")
 
         self.name = self.__class__.__name__.split("Class")[0]
         self._cache_location = None

astroquery/utils/tap/conn/tapconn.py

@@ -119,7 +119,7 @@ def __interna_init(self):
         self.__postHeaders = {
             "Content-type": CONTENT_TYPE_POST_DEFAULT,
             "Accept": "text/plain",
-            "User-Agent": "astroquery/{vers} ({plat} {sysver})".format(
+            "User-Agent": "astroquery/{vers} Python/{sysver} ({plat})".format(
                 vers=version.version, plat=platform.system(), sysver=platform.python_version()),
         }
         self.__getHeaders = {}