remove try/except clauses in more show messages, and set show_messages to false by default at import time

Author: keflavich

astroquery/esa/euclid/core.py

@@ -754,23 +754,20 @@ def get_status_messages(self, verbose=False):
             flag to display information about the process
 
         """
-        try:
-            sub_context = self.EUCLID_MESSAGES
-            conn_handler = self._TapPlus__getconnhandler()
-            response = conn_handler.execute_tapget(sub_context, verbose=verbose)
-            if response.status == 200:
-                if isinstance(response, Iterable):
-                    for line in response:
-
-                        try:
-                            print(line.decode("utf-8").split('=', 1)[1])
-                        except ValueError as e:
-                            print(e)
-                        except IndexError:
-                            print("Archive down for maintenance")
-
-        except OSError:
-            print("Status messages could not be retrieved")
+        sub_context = self.EUCLID_MESSAGES
+        conn_handler = self._TapPlus__getconnhandler()
+        response = conn_handler.execute_tapget(sub_context, verbose=verbose)
+        if response.status == 200:
+            if isinstance(response, Iterable):
+                for line in response:
+
+                    try:
+                        print(line.decode("utf-8").split('=', 1)[1])
+                    except ValueError as e:
+                        print(e)
+                    except IndexError:
+                        print("Archive down for maintenance")
+
 
     @staticmethod
     def __set_dirs(output_file, observation_id):
@@ -1601,4 +1598,4 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c
         return job.get_results()
 
 
-Euclid = EuclidClass()
+Euclid = EuclidClass(show_server_messages=False)

astroquery/esa/hubble/core.py

@@ -922,15 +922,13 @@ def get_status_messages(self):
         the status of eHST TAP
         """
 
-        try:
-            esautils.execute_servlet_request(
-                url=conf.EHST_TAP_SERVER + "/" + conf.EHST_MESSAGES,
-                tap=self.tap,
-                query_params={},
-                parser_method=self.parse_messages_response
-            )
-        except OSError:
-            print("Status messages could not be retrieved")
+        subContext = conf.EHST_MESSAGES
+        connHandler = self._tap._TapPlus__getconnhandler()
+        response = connHandler.execute_tapget(subContext, verbose=False)
+        if response.status == 200:
+            for line in response:
+                string_message = line.decode("utf-8")
+                print(string_message[string_message.index('=') + 1:])
 
     def parse_messages_response(self, response):
         string_messages = []
@@ -1051,5 +1049,8 @@ def get_datalabs_path(self, filename, default_volume=None):
         return full_path
 
 
+<<<<<<< HEAD
 # Need to be False in order to avoid reaching out to the remote server at import time
+=======
+>>>>>>> d99705881... remove try/except clauses in more show messages, and set show_messages to false by default at import time
 ESAHubble = ESAHubbleClass(show_messages=False)

astroquery/esa/jwst/core.py

@@ -694,16 +694,13 @@ def get_status_messages(self):
         the status of JWST TAP
         """
 
-        try:
-            subContext = conf.JWST_MESSAGES
-            connHandler = self.__jwsttap._TapPlus__getconnhandler()
-            response = connHandler.execute_tapget(subContext, verbose=False)
-            if response.status == 200:
-                for line in response:
-                    string_message = line.decode("utf-8")
-                    print(string_message[string_message.index('=') + 1:])
-        except OSError:
-            print("Status messages could not be retrieved")
+        subContext = conf.JWST_MESSAGES
+        connHandler = self.__jwsttap._TapPlus__getconnhandler()
+        response = connHandler.execute_tapget(subContext, verbose=False)
+        if response.status == 200:
+            for line in response:
+                string_message = line.decode("utf-8")
+                print(string_message[string_message.index('=') + 1:])
 
     def get_product_list(self, *, observation_id=None,
                          cal_level="ALL",
@@ -1275,4 +1272,4 @@ def get_decoded_string(str):
             return str
 
 
-Jwst = JwstClass()
+Jwst = JwstClass(show_messages=False)