Moved GAIA_MESSAGES from __init__.py to core.py.

Renamed "show_messages" by "show_server_messages"
Corrected test case as it was not contemplating the user case in which Gaia archive is down for maintenance.

Author: mhsarmiento

astroquery/gaia/__init__.py

@@ -39,8 +39,6 @@ class Conf(_config.ConfigNamespace):
                                       'MCMC_GSPPHOT',
                                       'MCMC_MSC']
 
-    GAIA_MESSAGES = _config.ConfigItem("notification?action=GetNotifications", "Gaia Messages")
-
 
 conf = Conf()
 

astroquery/gaia/core.py

@@ -45,14 +45,15 @@ class GaiaClass(TapPlus):
     MAIN_GAIA_TABLE_DEC = conf.MAIN_GAIA_TABLE_DEC
     ROW_LIMIT = conf.ROW_LIMIT
     VALID_DATALINK_RETRIEVAL_TYPES = conf.VALID_DATALINK_RETRIEVAL_TYPES
+    GAIA_MESSAGES = "notification?action=GetNotifications"
 
     def __init__(self, tap_plus_conn_handler=None,
                  datalink_handler=None,
                  gaia_tap_server='https://gea.esac.esa.int/',
                  gaia_data_server='https://gea.esac.esa.int/',
                  tap_server_context="tap-server",
                  data_server_context="data-server",
-                 verbose=False, show_messages=True):
+                 verbose=False, show_server_messages=True):
         super(GaiaClass, self).__init__(url=gaia_tap_server,
                                         server_context=tap_server_context,
                                         tap_context="tap",
@@ -76,7 +77,7 @@ def __init__(self, tap_plus_conn_handler=None,
             self.__gaiadata = datalink_handler
 
         # Enable notifications
-        if show_messages:
+        if show_server_messages:
             self.get_status_messages()
 
     def login(self, user=None, password=None, credentials_file=None,
@@ -921,18 +922,18 @@ def get_status_messages(self):
         the status of Gaia TAP
         """
         try:
-            print("parsing notification messages")
-            subContext = conf.GAIA_MESSAGES
+            subContext = self.GAIA_MESSAGES
             connHandler = self._TapPlus__getconnhandler()
             response = connHandler.execute_tapget(subContext, False)
             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 as e:
+                        except IndexError:
                             print("Archive down for maintenance")
 
         except OSError:

astroquery/gaia/tests/test_gaiatap.py

@@ -56,12 +56,12 @@ def test_show_message(self):
                                 headers=None)
         connHandler.set_default_response(dummy_response)
 
-        # show_messages
+        # show_server_messages
         tableRequest = 'notification?action=GetNotifications'
         connHandler.set_response(tableRequest, dummy_response)
 
         tapplus = TapPlus("http://test:1111/tap", connhandler=connHandler)
-        tap = GaiaClass(connHandler, tapplus, show_messages=True)
+        tap = GaiaClass(connHandler, tapplus, show_server_messages=True)
 
     def test_query_object(self):
         conn_handler = DummyConnHandler()
@@ -79,12 +79,12 @@ def test_query_object(self):
                                 headers=None)
         conn_handler.set_default_response(dummy_response)
 
-        # show_messages
+        # show_server_messages
         tableRequest = 'notification?action=GetNotifications'
         conn_handler.set_response(tableRequest, dummy_response)
 
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=True)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=True)
         # Launch response: we use default response because the query contains
         # decimals
         response_launch_job = DummyResponse()
@@ -165,7 +165,7 @@ def test_query_object(self):
     def test_query_object_async(self):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         jobid = '12345'
         # Launch response
         response_launch_job = DummyResponse()
@@ -260,7 +260,7 @@ def test_query_object_async(self):
     def test_cone_search_sync(self):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         # Launch response: we use default response because the query contains
         # decimals
         response_launch_job = DummyResponse()
@@ -313,7 +313,7 @@ def test_cone_search_sync(self):
     def test_cone_search_async(self):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         jobid = '12345'
         # Launch response
         response_launch_job = DummyResponse()
@@ -420,7 +420,7 @@ def __check_results_column(self, results, column_name, description, unit,
 
     def test_load_data(self):
         dummy_handler = DummyTapHandler()
-        tap = GaiaClass(dummy_handler, dummy_handler, show_messages=False)
+        tap = GaiaClass(dummy_handler, dummy_handler, show_server_messages=False)
 
         ids = "1,2,3,4"
         retrieval_type = "epoch_photometry"
@@ -459,7 +459,7 @@ def test_load_data(self):
 
     def test_get_datalinks(self):
         dummy_handler = DummyTapHandler()
-        tap = GaiaClass(dummy_handler, dummy_handler, show_messages=False)
+        tap = GaiaClass(dummy_handler, dummy_handler, show_server_messages=False)
         ids = ["1", "2", "3", "4"]
         verbose = True
         parameters = {}
@@ -471,7 +471,7 @@ def test_get_datalinks(self):
     def test_xmatch(self):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         jobid = '12345'
         # Launch response
         response_launch_job = DummyResponse()
@@ -619,7 +619,7 @@ def test_xmatch(self):
     def test_login(self, mock_login):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         tap.login("user", "password")
         assert (mock_login.call_count == 2)
         mock_login.side_effect = HTTPError("Login error")
@@ -631,7 +631,7 @@ def test_login(self, mock_login):
     def test_login_gui(self, mock_login_gui, mock_login):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         tap.login_gui()
         assert (mock_login_gui.call_count == 1)
         mock_login_gui.side_effect = HTTPError("Login error")
@@ -642,7 +642,7 @@ def test_login_gui(self, mock_login_gui, mock_login):
     def test_logout(self, mock_logout):
         conn_handler = DummyConnHandler()
         tapplus = TapPlus("http://test:1111/tap", connhandler=conn_handler)
-        tap = GaiaClass(conn_handler, tapplus, show_messages=False)
+        tap = GaiaClass(conn_handler, tapplus, show_server_messages=False)
         tap.logout()
         assert (mock_logout.call_count == 2)
         mock_logout.side_effect = HTTPError("Login error")