change to show_messages=True by default, but off at import time

correct bad merge

Author: keflavich

astroquery/esa/hubble/core.py

@@ -1049,8 +1049,5 @@ 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/gaia/core.py

@@ -55,7 +55,7 @@ def __init__(self, *, tap_plus_conn_handler=None,
                  gaia_data_server='https://gea.esac.esa.int/',
                  tap_server_context="tap-server",
                  data_server_context="data-server",
-                 verbose=False, show_server_messages=False):
+                 verbose=False, show_server_messages=True):
         super(GaiaClass, self).__init__(url=gaia_tap_server,
                                         server_context=tap_server_context,
                                         tap_context="tap",
@@ -1183,4 +1183,4 @@ def get_status_messages(self):
                         print("Archive down for maintenance")
 
 
-Gaia = GaiaClass()
+Gaia = GaiaClass(show_server_messages=False)