DEP: votable.tree.Table was renamed to TableElement

docs/dal/index.rst

@@ -895,7 +895,7 @@ conventions.
 
 If you want to work with the XML data structures
 :py:class:`astropy.io.votable.tree.VOTableFile` or
-:py:class:`astropy.io.votable.tree.Table`, they are accessible by the
+:py:class:`astropy.io.votable.tree.TableElement`, they are accessible by the
 attributes :py:attr:`pyvo.dal.DALResults.resultstable` and
 :py:attr:`pyvo.dal.DALResults.votable`, respectively.
 

pyvo/dal/adhoc.py

@@ -467,7 +467,7 @@ class DatalinkResults(DatalinkResultsMixin, DALResults):
 
     ``DatalinkResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/query.py

@@ -223,7 +223,7 @@ def execute_votable(self, post=False):
 
         Returns
         -------
-        astropy.io.votable.tree.Table
+        astropy.io.votable.tree.TableElement
            an Astropy votable Table instance
 
         Raises
@@ -420,7 +420,7 @@ def votable(self):
     @property
     def resultstable(self):
         """
-        The votable XML element `astropy.io.votable.tree.Table`
+        The votable XML element `astropy.io.votable.tree.TableElement`
         """
         return self._resultstable
 

pyvo/dal/scs.py

@@ -434,7 +434,7 @@ class SCSResults(DatalinkResultsMixin, DALResults):
 
     ``SCSResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/sia.py

@@ -594,7 +594,7 @@ class SIAResults(DatalinkResultsMixin, DALResults):
 
     ``SIAResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/sia2.py

@@ -487,7 +487,7 @@ class SIA2Results(DatalinkResultsMixin, DALResults):
 
     ``SIA2Results`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/sla.py

@@ -367,7 +367,7 @@ class SLAResults(DALResults):
 
     ``SLAResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/ssa.py

@@ -597,7 +597,7 @@ class SSAResults(DatalinkResultsMixin, DALResults):
 
     ``SSAResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the spectra.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/tap.py

@@ -1147,7 +1147,7 @@ class TAPResults(DatalinkResultsMixin, DALResults):
 
     ``TAPResults`` is essentially a wrapper around an Astropy
     :py:mod:`~astropy.io.votable`
-    :py:class:`~astropy.io.votable.tree.Table` instance where the
+    :py:class:`~astropy.io.votable.tree.TableElement` instance where the
     columns contain the various metadata describing the images.
     One can access that VOTable directly via the
     :py:attr:`~pyvo.dal.query.DALResults.votable` attribute.  Thus,

pyvo/dal/tests/test_query.py

@@ -20,9 +20,15 @@
 from pyvo.version import version
 
 from astropy.table import Table, QTable
-from astropy.io.votable.tree import VOTableFile, Table as VOTable
-from astropy.io.fits import HDUList
+from astropy.io.votable.tree import VOTableFile
+
+try:
+    # Workaround astropy deprecation, remove try/except once >=6.0 is required
+    from astropy.io.votable.tree import TableElement
+except ImportError:
+    from astropy.io.votable.tree import Table as TableElement
 
+from astropy.io.fits import HDUList
 from astropy.utils.data import get_pkg_data_contents
 
 get_pkg_data_contents = partial(
@@ -271,7 +277,7 @@ def test_init(self):
 
         assert dalresults.queryurl == 'http://example.com/query/basic'
         assert isinstance(dalresults.votable, VOTableFile)
-        assert isinstance(dalresults.resultstable, VOTable)
+        assert isinstance(dalresults.resultstable, TableElement)
 
         assert dalresults.fieldnames == ('1', '2')
         assert (