ENH: returning QTable for query_sia and query_ssa

Author: bsipocz

astroquery/alma/core.py

@@ -652,10 +652,10 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
 
         Returns
         -------
-        Results in `~pyvo.dal.sia2.SIA2Results` format.
-        result.to_qtable in `~astropy.table.QTable` format
+        Results in `~astropy.table.QTable` format.
+
         """
-        return self.sia.search(
+        results = self.sia.search(
             pos=pos,
             band=band,
             time=time,
@@ -676,6 +676,8 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
             maxrec=maxrec,
             **kwargs)
 
+        return results.to_qtable()
+
     query_sia.__doc__ = query_sia.__doc__.replace('_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
 
     def query_tap(self, query, *, maxrec=None, uploads=None):

astroquery/alma/tests/test_alma.py

@@ -464,7 +464,9 @@ def test_sia():
     sia_mock = Mock()
     empty_result = Table.read(os.path.join(DATA_DIR, 'alma-empty.txt'),
                               format='ascii')
-    sia_mock.search.return_value = Mock(table=empty_result)
+    mock_result = Mock()
+    mock_result.to_qtable.return_value = empty_result
+    sia_mock.search.return_value = mock_result
     alma = Alma()
     alma._get_dataarchive_url = Mock()
     alma._sia = sia_mock
@@ -477,7 +479,7 @@ def test_sia():
                             target_name='J0423-013',
                             publisher_did='ADS/JAO.ALMA#2013.1.00546.S',
                             exptime=25)
-    assert len(result.table) == 0
+    assert len(result) == 0
     assert_called_with(sia_mock.search, calib_level=[0, 1],
                        band=(300, 400), data_type='cube',
                        pos='CIRCLE 1 2 1',

astroquery/ipac/irsa/core.py

@@ -102,10 +102,10 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
 
         Returns
         -------
-        Results in `pyvo.dal.SIAResults` format.
-        result.to_table() in Astropy table format
+        Results in `~astropy.table.QTable` format.
+
         """
-        return self.sia.search(
+        results = self.sia.search(
             pos=pos,
             band=band,
             time=time,
@@ -126,6 +126,8 @@ def query_sia(self, *, pos=None, band=None, time=None, pol=None,
             maxrec=maxrec,
             **kwargs)
 
+        return results.to_qtable()
+
     query_sia.__doc__ = query_sia.__doc__.replace('_SIA2_PARAMETERS', SIA2_PARAMETERS_DESC)
 
     def query_ssa(self, *, pos=None, radius=None, band=None, time=None, collection=None):
@@ -151,17 +153,17 @@ def query_ssa(self, *, pos=None, radius=None, band=None, time=None, collection=N
 
         Returns
         -------
-        Results in `pyvo.dal.SSAResults` format.
-        result.to_table() in Astropy table format
+        Results in `~astropy.table.QTable` format.
         """
 
         if radius is None:
             diameter = None
         else:
             diameter = 2 * radius
 
-        return self.ssa.search(pos=pos, diameter=diameter, band=band, time=time,
-                               format='all', collection=collection)
+        results = self.ssa.search(pos=pos, diameter=diameter, band=band, time=time,
+                                  format='all', collection=collection)
+        return results.to_qtable()
 
     def list_collections(self, servicetype=None):
         """

astroquery/ipac/irsa/tests/test_irsa_remote.py

@@ -92,5 +92,5 @@ def test_ssa(self):
         coord = SkyCoord.from_name("Eta Carina")
         result = Irsa.query_ssa(pos=coord)
         assert len(result) > 260
-        collections = set(result.to_table()['dataid_collection'])
+        collections = set(result['dataid_collection'])
         assert {'champ', 'iso_sws', 'sofia_forcast', 'sofia_great', 'spitzer_sha'}.issubset(collections)