changes suggested by @bsipocz

Author: emolter

astroquery/solarsystem/pds/core.py

@@ -84,16 +84,12 @@ def __init__(self, url='', timeout=None):
     def _url(self):
         return self.url or conf.url
 
-    @property
-    def _timeout(self):
-        return conf.timeout if self.timeout is None else self.timeout
-
     def __str__(self):
 
         return "PDSRingNode instance"
 
     def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel=3,
-                            get_query_payload=False, get_raw_response=False, cache=True):
+                            get_query_payload=False, cache=True):
         """
         send query to Planetary Ring Node server
 
@@ -117,6 +113,8 @@ def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel
         get_query_payload : boolean, optional
             When set to `True` the method returns the HTTP request parameters as
             a dict, default: False
+        cache : boolean, optional
+            When set to `True` the method caches the download, default: True
 
 
         Returns
@@ -230,7 +228,7 @@ def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel
 
         # query and parse
         response = self._request(
-            "GET", self._url, params=request_payload, timeout=self._timeout, cache=cache
+            "GET", self._url, params=request_payload, timeout=self.timeout, cache=cache
         )
 
         return response
@@ -251,7 +249,6 @@ def _parse_result(self, response, verbose=None):
         bodytable : `astropy.QTable`
         ringtable : `astropy.QTable`
         """
-        self.last_response = response
         try:
             self._last_query.remove_cache_file(self.cache_location)
         except FileNotFoundError:

astroquery/solarsystem/pds/tests/test_ringnode.py renamed to astroquery/solarsystem/pds/tests/test_pds.py

@@ -53,7 +53,9 @@ def test_parse_result(patch_request):
 
 def test_ephemeris_query_Uranus(patch_request):
 
-    bodytable, ringtable = pds.RingNode.ephemeris(
+    pds_inst = pds.RingNode()
+    pds_inst._last_query = AstroQuery('GET', 'http://dummy')
+    bodytable, ringtable = pds_inst.ephemeris(
         planet="Uranus",
         epoch="2022-05-03 00:00",
         location=(-120.355 * u.deg, 10.0 * u.deg, 1000 * u.m),
@@ -128,7 +130,9 @@ def test_ephemeris_query_Uranus(patch_request):
 
 def test_ephemeris_query_Pluto(patch_request):
 
-    bodytable, ringtable = pds.RingNode.ephemeris(
+    pds_inst = pds.RingNode()
+    pds_inst._last_query = AstroQuery('GET', 'http://dummy')
+    bodytable, ringtable = pds_inst.ephemeris(
         planet="Pluto",
         epoch="2021-10-07 07:25",
     )
@@ -201,7 +205,9 @@ def test_ephemeris_query_Pluto(patch_request):
 def test_ephemeris_query_Neptune(patch_request):
     '''Verify that the Neptune ring arcs are queried properly'''
 
-    bodytable, ringtable = pds.RingNode.ephemeris(
+    pds_inst = pds.RingNode()
+    pds_inst._last_query = AstroQuery('GET', 'http://dummy')
+    bodytable, ringtable = pds_inst.ephemeris(
         planet="Neptune",
         epoch="2021-10-07 07:25",
         neptune_arcmodel=2
@@ -233,7 +239,9 @@ def test_ephemeris_query_Neptune(patch_request):
 
 def test_ephemeris_query_Saturn(patch_request):
     '''Check Saturn F ring is queried properly'''
-    bodytable, ringtable = pds.RingNode.ephemeris(
+    pds_inst = pds.RingNode()
+    pds_inst._last_query = AstroQuery('GET', 'http://dummy')
+    bodytable, ringtable = pds_inst.ephemeris(
         planet="Saturn",
         epoch="2021-10-07 07:25",
     )
@@ -249,7 +257,9 @@ def test_ephemeris_query_Saturn(patch_request):
 
 
 def test_ephemeris_query_payload():
-    res = pds.RingNode.ephemeris(
+    pds_inst = pds.RingNode()
+    pds_inst._last_query = AstroQuery('GET', 'http://dummy')
+    res = pds_inst.ephemeris(
         planet="Neptune",
         epoch="2022-05-03 00:00",
         neptune_arcmodel=1,

astroquery/solarsystem/pds/tests/test_ringnode_remote.py renamed to astroquery/solarsystem/pds/tests/test_pds_remote.py

@@ -18,13 +18,13 @@ In order to query information for a specific Solar System body, a
 ``RingNode`` object is instantiated and the :meth:`~astroquery.solarsystem.pds.RingNodeClass.ephemeris` method is called. The following example queries the
 ephemerides of the rings and small moons around Uranus as viewed from ALMA:
 
-.. code-block:: python
+.. code-block:: python 
 
    >>> from astroquery.solarsystem.pds import RingNode
    >>> import astropy.units as u
    >>> bodytable, ringtable = RingNode.ephemeris(planet='Uranus',
    ...                 epoch='2024-05-08 22:39',
-   ...                 location = (-67.755 * u.deg, -23.029 * u.deg, 5000 * u.m))  # doctest: +REMOTE_DATA
+   ...                 location = (-67.755 * u.deg, -23.029 * u.deg, 5000 * u.m)) # doctest: +REMOTE_DATA
    >>> print(ringtable) # doctest: +REMOTE_DATA
          ring  pericenter ascending node
                   deg          deg
@@ -42,11 +42,11 @@ ephemerides of the rings and small moons around Uranus as viewed from ALMA:
 
 ``planet`` must be one of ['mars', 'jupiter', 'uranus', 'saturn', 'neptune', 'pluto'] (case-insensitive)
 
-.. code-block:: python
+.. code-block:: python 
 
    >>> bodytable, ringtable = RingNode.ephemeris(planet='Venus',
    ...                 epoch='2024-05-08 22:39',
-   ...                 location = (-67.755 * u.deg, -23.029 * u.deg, 5000 * u.m))
+   ...                 location = (-67.755 * u.deg, -23.029 * u.deg, 5000 * u.m)) # doctest: +REMOTE_DATA
    Traceback (most recent call last):
    ...
    ValueError: illegal value for 'planet' parameter (must be 'Mars', 'Jupiter', 'Saturn', 'Uranus', 'Neptune', or 'Pluto')
@@ -61,24 +61,24 @@ Outputs
 ---------
 ``bodytable`` is a `~astropy.table.QTable` containing ephemeris information on the moons in the planetary system. Every column is assigned a unit from `~astropy.units`. We can get a list of all the columns in this table with:
 
-.. code-block:: python
+.. code-block:: python 
 
-	>>> print(bodytable.columns)
+	>>> print(bodytable.columns) # doctest: +REMOTE_DATA
 	<TableColumns names=('NAIF ID','Body','RA','Dec','RA (deg)','Dec (deg)','dRA','dDec','sub_obs_lon','sub_obs_lat','sub_sun_lon','sub_sun_lat','phase','distance')>
 
 ``ringtable`` is a `~astropy.table.QTable` containing ephemeris information on the individual rings in the planetary system. Every column is assigned a unit from `~astropy.units`. We can get a list of all the columns in this table with:
 
 .. code-block:: python
 
-	>>> print(ringtable.columns)
+	>>> print(ringtable.columns) # doctest: +REMOTE_DATA
 	<TableColumns names=('ring','pericenter','ascending node')>
 	
 Note that the behavior of ``ringtable`` changes depending on the planet you query. For Uranus and Saturn the table columns are as above. For Jupiter, Mars, and Pluto, there are no individual named rings returned by the Ring Node, so ``ringtable`` returns None; ephemeris for the ring systems of these bodies is still contained in ``systemtable`` as usual. For Neptune, the ring table shows the minimum and maximum longitudes (from the ring plane ascending node) of the five ring arcs according to the orbital evolution assumed by ``neptune_arcmodel``, e.g.:
 
-.. code-block:: python
+.. code-block:: python 
 
 	>>> bodytable, ringtable = RingNode.ephemeris(planet='Neptune', epoch='2022-05-24 00:00') # doctest: +REMOTE_DATA
-	>>> print(ringtable)
+	>>> print(ringtable) # doctest: +REMOTE_DATA
     	   ring    min_angle max_angle
     	              deg       deg   
     	---------- --------- ---------
@@ -90,10 +90,10 @@ Note that the behavior of ``ringtable`` changes depending on the planet you quer
 		
 System-wide data are available as metadata in both ``bodytable`` and ``ringtable`` (if ``ringtable`` exists), e.g.:
 
-.. code-block:: python
+.. code-block:: python 
 
-	>>> systemtable = bodytable.meta
-	>>> print(systemtable.keys())
+	>>> systemtable = bodytable.meta # doctest: +REMOTE_DATA
+	>>> print(systemtable.keys()) # doctest: +REMOTE_DATA
 	dict_keys(['sub_sun_lat', 'sub_sun_lat_min', 'sub_sun_lat_max', 'opening_angle', 'phase_angle', 'sub_sun_lon', 'sub_obs_lon', 'd_sun', 'd_obs', 'light_time', 'epoch'])