Refactor: Fix esa where changes to utils breaks esa

Author: nkphysics

astroquery/esa/hubble/core.py

@@ -105,7 +105,7 @@ def download_product(self, observation_id, *, calibration_level=None,
             params["PRODUCTTYPE"] = product_type
 
         filename = self._get_product_filename(product_type, filename)
-        self._tap.load_data(params, filename, verbose=verbose)
+        self._tap.load_data(params_dict=params, output_file=filename, verbose=verbose)
 
         return filename
 
@@ -254,7 +254,7 @@ def get_artifact(self, artifact_id, *, filename=None, verbose=False):
         if filename is None:
             filename = artifact_id
 
-        self._tap.load_data(params, filename, verbose=verbose)
+        self._tap.load_data(params_dict=params, output_file=filename, verbose=verbose)
 
         return filename
 
@@ -302,7 +302,7 @@ def get_postcard(self, observation_id, *, calibration_level="RAW",
         if filename is None:
             filename = observation_id
 
-        self._tap.load_data(params, filename, verbose=verbose)
+        self._tap.load_data(params_dict=params, output_file=filename, verbose=verbose)
 
         return filename
 
@@ -505,7 +505,7 @@ def _query_tap_target(self, target):
             subContext = conf.EHST_TARGET_ACTION
             connHandler = self._tap._TapPlus__getconnhandler()
             data = urlencode(params)
-            target_response = connHandler.execute_secure(subContext, data, True)
+            target_response = connHandler.execute_secure(subContext, data, verbose=True)
             for line in target_response:
                 target_result = json.loads(line.decode("utf-8"))
                 if target_result['objects']:
@@ -763,7 +763,7 @@ def get_status_messages(self):
         try:
             subContext = conf.EHST_MESSAGES
             connHandler = self._tap._TapPlus__getconnhandler()
-            response = connHandler.execute_tapget(subContext, False)
+            response = connHandler.execute_tapget(subContext, verbose=False)
             if response.status == 200:
                 for line in response:
                     string_message = line.decode("utf-8")

astroquery/esa/jwst/core.py

@@ -93,9 +93,9 @@ def load_tables(self, *, only_names=False, include_shared_tables=False,
         -------
         A list of table objects
         """
-        return self.__jwsttap.load_tables(only_names,
-                                          include_shared_tables,
-                                          verbose)
+        return self.__jwsttap.load_tables(only_names=only_names,
+                                          include_shared_tables=include_shared_tables,
+                                          verbose=verbose)
 
     def load_table(self, table, *, verbose=False):
         """Loads the specified table
@@ -112,7 +112,7 @@ def load_table(self, table, *, verbose=False):
         -------
         A table object
         """
-        return self.__jwsttap.load_table(table, verbose)
+        return self.__jwsttap.load_table(table, verbose=verbose)
 
     def launch_job(self, query, *, name=None, output_file=None,
                    output_format="votable", verbose=False, dump_to_file=False,
@@ -686,7 +686,7 @@ def get_status_messages(self):
         try:
             subContext = conf.JWST_MESSAGES
             connHandler = self.__jwsttap._TapPlus__getconnhandler()
-            response = connHandler.execute_tapget(subContext, False)
+            response = connHandler.execute_tapget(subContext, verbose=False)
             if response.status == 200:
                 for line in response:
                     string_message = line.decode("utf-8")

astroquery/esa/jwst/tests/test_jwsttap.py

@@ -231,7 +231,7 @@ def test_list_async_jobs(self):
 
     def test_query_region(self):
         connHandler = DummyConnHandler()
-        tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
+        tapplus = TapPlus(url="http://test:1111/tap", connhandler=connHandler)
         tap = JwstClass(tap_plus_handler=tapplus, show_messages=False)
 
         # Launch response: we use default response because the
@@ -364,7 +364,7 @@ def test_query_region(self):
 
     def test_query_region_async(self):
         connHandler = DummyConnHandler()
-        tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
+        tapplus = TapPlus(url="http://test:1111/tap", connhandler=connHandler)
         tap = JwstClass(tap_plus_handler=tapplus, show_messages=False)
         jobid = '12345'
         # Launch response
@@ -436,7 +436,7 @@ def test_query_region_async(self):
 
     def test_cone_search_sync(self):
         connHandler = DummyConnHandler()
-        tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
+        tapplus = TapPlus(url="http://test:1111/tap", connhandler=connHandler)
         tap = JwstClass(tap_plus_handler=tapplus, show_messages=False)
         # Launch response: we use default response because the
         # query contains decimals
@@ -521,7 +521,7 @@ def test_cone_search_sync(self):
 
     def test_cone_search_async(self):
         connHandler = DummyConnHandler()
-        tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
+        tapplus = TapPlus(url="http://test:1111/tap", connhandler=connHandler)
         tap = JwstClass(tap_plus_handler=tapplus, show_messages=False)
         jobid = '12345'
         # Launch response

docs/esa/hubble/hubble.rst

@@ -82,7 +82,7 @@ This third case will download the science files associated to the observation 'j
 
   >>> from astroquery.esa.hubble import ESAHubble
   >>> esahubble = ESAHubble()
-  >>> esahubble.get_postcard(observation_id="j6fl25s4q", calibration_level="RAW", resolution=256, filename="raw_postcard_for_j6fl25s4q.jpg")  # doctest: +IGNORE_OUTPUT
+  >>> esahubble.get_postcard("j6fl25s4q", calibration_level="RAW", resolution=256, filename="raw_postcard_for_j6fl25s4q.jpg")  # doctest: +IGNORE_OUTPUT
 
 This will download the postcard for the observation 'J8VP03010' with low
 resolution (256) and it will stored in a jpg called