revert alma

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 `~astropy.table.QTable` format.
-
+        Results in `~pyvo.dal.sia2.SIA2Results` format.
+        result.to_qtable in `~astropy.table.QTable` format
         """
-        results = self.sia.search(
+        return self.sia.search(
             pos=pos,
             band=band,
             time=time,
@@ -676,8 +676,6 @@ 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,9 +464,7 @@ def test_sia():
     sia_mock = Mock()
     empty_result = Table.read(os.path.join(DATA_DIR, 'alma-empty.txt'),
                               format='ascii')
-    mock_result = Mock()
-    mock_result.to_qtable.return_value = empty_result
-    sia_mock.search.return_value = mock_result
+    sia_mock.search.return_value = Mock(table=empty_result)
     alma = Alma()
     alma._get_dataarchive_url = Mock()
     alma._sia = sia_mock
@@ -479,7 +477,7 @@ def test_sia():
                             target_name='J0423-013',
                             publisher_did='ADS/JAO.ALMA#2013.1.00546.S',
                             exptime=25)
-    assert len(result) == 0
+    assert len(result.table) == 0
     assert_called_with(sia_mock.search, calib_level=[0, 1],
                        band=(300, 400), data_type='cube',
                        pos='CIRCLE 1 2 1',