Merge pull request #2762 from bsipocz/enh_more_user_agent

ENH: adding more info to User-Agent

Author: bsipocz

CHANGES.rst

@@ -269,6 +269,8 @@ Infrastructure, Utility and Other Changes and Additions
 - New function, ``utils.cleanup_downloads.cleanup_saved_downloads``, is
   added to help the testcleanup narrative in narrative documentations. [#2384]
 
+- Adding more system information to User-Agent. [#2762]
+
 - Removal of the non-functional ``nrao`` module as it was completely
   incompatible with the refactored upstream API. [#2546]
 

astroquery/mast/utils.py

@@ -10,7 +10,9 @@
 
 import requests
 import json
+import platform
 from urllib import parse
+
 import astropy.coordinates as coord
 
 from ..version import version
@@ -74,7 +76,8 @@ def _simple_request(url, params):
     """
 
     session = requests.session()
-    headers = {"User-Agent": "astroquery/{} {}".format(version, session.headers['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

@@ -8,6 +8,7 @@
 import keyring
 import io
 import os
+import platform
 import requests
 import textwrap
 
@@ -184,9 +185,8 @@ def __init__(self):
         S = self._session = requests.Session()
         self._session.hooks['response'].append(self._response_hook)
         S.headers['User-Agent'] = (
-            'astroquery/{vers} {olduseragent}'
-            .format(vers=version.version,
-                    olduseragent=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

@@ -15,14 +15,11 @@
 
 """
 
-try:
-    # python 3
-    import http.client as httplib
-except ImportError:
-    # python 2
-    import httplib
+import http.client as httplib
 import mimetypes
+import platform
 import time
+
 from astroquery.utils.tap.xmlparser import utils
 from astroquery.utils.tap import taputils
 from astroquery import version
@@ -122,7 +119,8 @@ def __interna_init(self):
         self.__postHeaders = {
             "Content-type": CONTENT_TYPE_POST_DEFAULT,
             "Accept": "text/plain",
-            "User-Agent": "astroquery/{vers}".format(vers=version.version),
+            "User-Agent": "astroquery/{vers} Python/{sysver} ({plat})".format(
+                vers=version.version, plat=platform.system(), sysver=platform.python_version()),
         }
         self.__getHeaders = {}
         self.__cookie = None