DOC: fix sphinx build and cleanup init

Author: bsipocz

astroquery/ipac/irsa/__init__.py

@@ -4,8 +4,8 @@
 ===============
 
 This module contains various methods for querying the
-IRSA Catalog Query Service(CatQuery) and the Moving
-Object Search Tool (MOST).
+IRSA Services.
+
 """
 from astropy import config as _config
 
@@ -14,13 +14,6 @@ class Conf(_config.ConfigNamespace):
     """
     Configuration parameters for `astroquery.ipac.irsa`.
     """
-
-    irsa_server = _config.ConfigItem(
-        'https://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-query',
-        'Name of the IRSA mirror to use.')
-    gator_list_catalogs = _config.ConfigItem(
-        'https://irsa.ipac.caltech.edu/cgi-bin/Gator/nph-scan',
-        'URL from which to list all the public catalogs in IRSA.')
     most_server = _config.ConfigItem(
         'https://irsa.ipac.caltech.edu/cgi-bin/MOST/nph-most',
         'URL address of the MOST service.')

astroquery/ipac/irsa/core.py

@@ -11,7 +11,7 @@
 from astropy.coordinates import SkyCoord
 from astropy import units as u
 from astropy.utils.decorators import deprecated_renamed_argument
-from pyvo.dal.tap import TAPService
+from pyvo.dal import TAPService
 from astroquery import log
 from astroquery.query import BaseQuery
 from astroquery.utils.commons import parse_coordinates
@@ -37,7 +37,7 @@ def tap(self):
 
     def query_tap(self, query, *, maxrec=None):
         """
-        Send query to IRSA TAP. Results in `~pyvo.dal.TapResult` format.
+        Send query to IRSA TAP. Results in `~pyvo.dal.TAPResults` format.
         result.to_qtable in `~astropy.table.QTable` format
 
         Parameters
@@ -47,9 +47,9 @@ def query_tap(self, query, *, maxrec=None):
         maxrec : int
             maximum number of records to return
 
-        Return
-        ------
-        result : `~pyvo.dal.TapResult`
+        Returns
+        -------
+        result : `~pyvo.dal.TAPResults`
             TAP query result.
         result.to_table : `~astropy.table.Table`
             TAP query result as `~astropy.table.Table`
@@ -66,23 +66,17 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
                      get_query_payload=False, columns=None,
                      verbose=False, cache=True):
         """
-        This function serves the same purpose as
-        :meth:`~astroquery.ipac.irsa.IrsaClass.query_region`, but returns the raw
-        HTTP response rather than the results in a `~astropy.table.Table`.
+        Queries the IRSA TAP server around a coordinate and returns a `~astropy.table.Table` object.
 
         Parameters
         ----------
         coordinates : str, `astropy.coordinates` object
-            Gives the position of the center of the cone or box if
-            performing a cone or box search. The string can give coordinates
-            in various coordinate systems, or the name of a source that will
-            be resolved on the server (see `here
-            <https://irsa.ipac.caltech.edu/search_help.html>`_ for more
-            details). Required if spatial is ``'Cone'`` or ``'Box'``. Optional
-            if spatial is ``'Polygon'`` or ``'All-Sky'``.
+            Gives the position of the center of the cone or box if performing a cone or box search.
+            Required if spatial is ``'Cone'`` or ``'Box'``. Ignored if spatial is ``'Polygon'`` or
+            ``'All-Sky'``.
         catalog : str
             The catalog to be used. To list the available catalogs, use
-            :meth:`~astroquery.ipac.irsa.IrsaClass.print_catalogs`.
+            :meth:`~astroquery.ipac.irsa.IrsaClass.list_catalogs`.
         spatial : str
             Type of spatial query: ``'Cone'``, ``'Box'``, ``'Polygon'``, and
             ``'All-Sky'``. Defaults to ``'Cone'``.
@@ -107,6 +101,7 @@ def query_region(self, coordinates=None, *, catalog=None, spatial='Cone',
 
         Returns
         -------
+        table : A `~astropy.table.Table` object.
         """
         if catalog is None:
             raise InvalidQueryError("Catalog name is required!")