eHST: remove warning in deprecated method, tap_client as variable

Author: jespinosaar

astroquery/esa/hubble/core.py

@@ -587,9 +587,7 @@ def query_tap(self, query, *, async_job=False, output_file=None,
         table = job.get_results()
         return table
 
-    @deprecated(since="0.4.7", message=("Use of query_hst_tap method is no longer supported. "
-                "Please use query_tap method instead, with the same arguments."),
-                alternative="query_tap")
+    @deprecated(since="0.4.7", alternative="query_tap")
     def query_hst_tap(self, query, *, async_job=False, output_file=None,
                       output_format="votable", verbose=False):
         """Launches a synchronous or asynchronous job to query the HST tap
@@ -613,10 +611,6 @@ def query_hst_tap(self, query, *, async_job=False, output_file=None,
         -------
         A table object
         """
-        warnings.warn(
-            "Use of query_hst_tap method is no longer supported. Please use"
-            " query_tap method instead, with the same arguments.",
-            AstropyDeprecationWarning)
         self.query_tap(query=query, async_job=False, output_file=None,
                        output_format="votable", verbose=False)
 

astroquery/utils/tap/core.py

@@ -34,7 +34,6 @@
 __all__ = ['Tap', 'TapPlus']
 
 VERSION = "20200428.1"
-TAP_CLIENT_ID = f"aqtappy1-{VERSION}"
 
 
 class Tap:
@@ -138,6 +137,7 @@ def __init__(self, url=None,
 
     def __internalInit(self):
         self.__connHandler = None
+        self.tap_client_id = f"aqtappy1-{VERSION}"
 
     def load_tables(self, verbose=False):
         """Loads all public tables
@@ -585,7 +585,7 @@ def __launchJobMultipart(self, query, uploadResource, uploadTableName,
             "REQUEST": "doQuery",
             "LANG": "ADQL",
             "FORMAT": str(outputFormat),
-            "tapclient": str(TAP_CLIENT_ID),
+            "tapclient": str(self.tap_client_id),
             "QUERY": str(query),
             "UPLOAD": "" + str(uploadValue)}
         if maxrec is not None:
@@ -625,7 +625,7 @@ def __launchJob(self, query, outputFormat, context, verbose, name=None,
             "REQUEST": "doQuery",
             "LANG": "ADQL",
             "FORMAT": str(outputFormat),
-            "tapclient": str(TAP_CLIENT_ID),
+            "tapclient": str(self.tap_client_id),
             "QUERY": str(query)}
         if maxrec is not None:
             args['MAXREC'] = maxrec
@@ -799,11 +799,9 @@ def __internalInit(self):
         self.__pwd = None
         self.__isLoggedIn = False
 
-    @staticmethod
-    def __set_client_id(client_id):
+    def __set_client_id(self, client_id):
         if client_id:
-            global TAP_CLIENT_ID
-            TAP_CLIENT_ID = client_id
+            self.tap_client_id = client_id
 
     def load_tables(self, only_names=False, include_shared_tables=False,
                     verbose=False):