forgot to test before push 🤦

Author: Edward Molter

astroquery/solarsystem/pds/core.py

@@ -1,5 +1,6 @@
 # 1. standard library imports
 import re
+import os
 
 # 2. third party imports
 from astropy.time import Time
@@ -185,13 +186,13 @@ def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel
             )
 
         # configure request_payload for ephemeris query
-        # thankfully, adding extra planet-specific keywords here does not break query for other planets
+
         request_payload = dict(
             [
                 ("abbrev", planet[:3]),
                 ("ephem", planet_defaults[planet]["ephem"]),
                 ("time", epoch.utc.iso[:16]),
-                ("fov", 10),  # next few are figure options, can be hardcoded and ignored
+                ("fov", 10),  # figure option - hardcode ok
                 ("fov_unit", planet.capitalize() + " radii"),
                 ("center", "body"),
                 ("center_body", planet.capitalize()),
@@ -202,7 +203,7 @@ def ephemeris_async(self, planet, *, epoch=None, location=None, neptune_arcmodel
                 ("center_dec", ""),
                 ("center_star", ""),
                 ("viewpoint", viewpoint),
-                ("observatory", observatory),  # has no effect if viewpoint != observatory so can hardcode. no plans to implement calling observatories by name since ring node only names like 8 observatories
+                ("observatory", observatory),
                 ("latitude", latitude),
                 ("longitude", longitude),
                 ("lon_dir", "east"),
@@ -263,18 +264,15 @@ def _parse_result(self, response, verbose=None):
 
         soup = BeautifulSoup(response.text, "html.parser")
         text = soup.get_text()
-        if "\n" in text:
-            text = text.replace("\r", "")
-        else:
-            text = text.replace("\r", "\n")
-        textgroups = re.split("\n\n|\n \n", text)
+        # need regex because some blank lines have spacebar and some do not
+        textgroups = re.split(2*os.linesep+"|"+os.linesep+" "+os.linesep, text)
         ringtable = None
         for group in textgroups:
-            group = group.strip(", \n")
+            group = group.strip()
 
             # input parameters. only thing needed is epoch
             if group.startswith("Observation"):
-                epoch = group.split("\n")[0].split("e: ")[-1].strip(", \n")
+                epoch = group.splitlines()[0].split("e: ")[-1].strip()
 
             # minor body table part 1
             elif group.startswith("Body"):
@@ -292,7 +290,7 @@ def _parse_result(self, response, verbose=None):
             # minor body table part 2
             elif group.startswith("Sub-"):
 
-                group = "\n".join(group.split("\n")[2:])  # removing two-row header entirely
+                group = os.linesep.join(group.splitlines()[2:])  # removing two-row header entirely
                 bodytable2_names = ("NAIF ID", "Body", "sub_obs_lon", "sub_obs_lat", "sub_sun_lon", "sub_sun_lat", "phase", "distance")
                 bodytable2_units = [None, None, u.deg, u.deg, u.deg, u.deg, u.deg, u.km * 1e6]
                 bodytable2 = table.QTable.read(group, format="ascii.fixed_width",
@@ -306,12 +304,12 @@ def _parse_result(self, response, verbose=None):
 
             # ring plane data
             elif group.startswith("Ring s"):
-                lines = group.split("\n")
+                lines = group.splitlines()
                 for line in lines:
                     l = line.split(":")
                     if "Ring sub-solar latitude" in l[0]:
                         [sub_sun_lat, sub_sun_lat_min, sub_sun_lat_max] = [
-                            float(s.strip(", \n()")) for s in re.split(r"\(|to", l[1])
+                            float(s.strip("()")) for s in re.split(r"\(|to", l[1])
                         ]
                         systemtable = {
                             "sub_sun_lat": sub_sun_lat * u.deg,
@@ -321,22 +319,22 @@ def _parse_result(self, response, verbose=None):
 
                     elif "Ring plane opening angle" in l[0]:
                         systemtable["opening_angle"] = (
-                            float(re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")) * u.deg
+                            float(re.sub("[a-zA-Z]+", "", l[1]).strip("()")) * u.deg
                         )
                     elif "Ring center phase angle" in l[0]:
-                        systemtable["phase_angle"] = float(l[1].strip(", \n")) * u.deg
+                        systemtable["phase_angle"] = float(l[1].strip()) * u.deg
                     elif "Sub-solar longitude" in l[0]:
                         systemtable["sub_sun_lon"] = (
-                            float(re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()")) * u.deg
+                            float(re.sub("[a-zA-Z]+", "", l[1]).strip("()")) * u.deg
                         )
                     elif "Sub-observer longitude" in l[0]:
-                        systemtable["sub_obs_lon"] = float(l[1].strip(", \n")) * u.deg
+                        systemtable["sub_obs_lon"] = float(l[1].strip()) * u.deg
                     else:
                         pass
 
             # basic info about the planet
             elif group.startswith("Sun-planet"):
-                lines = group.split("\n")
+                lines = group.splitlines()
                 for line in lines:
                     l = line.split(":")
                     if "Sun-planet distance (AU)" in l[0]:
@@ -347,14 +345,14 @@ def _parse_result(self, response, verbose=None):
                         pass
                     elif "Sun-planet distance (km)" in l[0]:
                         systemtable["d_sun"] = (
-                            float(l[1].split("x")[0].strip(", \n")) * 1e6 * u.km
+                            float(l[1].split("x")[0].strip()) * 1e6 * u.km
                         )
                     elif "Observer-planet distance (km)" in l[0]:
                         systemtable["d_obs"] = (
-                            float(l[1].split("x")[0].strip(", \n")) * 1e6 * u.km
+                            float(l[1].split("x")[0].strip()) * 1e6 * u.km
                         )
                     elif "Light travel time" in l[0]:
-                        systemtable["light_time"] = float(l[1].strip(", \n")) * u.second
+                        systemtable["light_time"] = float(l[1].strip()) * u.second
                     else:
                         pass
 
@@ -373,13 +371,13 @@ def _parse_result(self, response, verbose=None):
 
             # Saturn F-ring data
             elif group.startswith("F Ring"):
-                lines = group.split("\n")
+                lines = group.splitlines()
                 for line in lines:
                     l = line.split(":")
                     if "F Ring pericenter" in l[0]:
-                        peri = float(re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()"))
+                        peri = float(re.sub("[a-zA-Z]+", "", l[1]).strip("()"))
                     elif "F Ring ascending node" in l[0]:
-                        ascn = float(l[1].strip(", \n"))
+                        ascn = float(l[1].strip())
                 ringtable_names = ("ring", "pericenter", "ascending node")
                 ringtable_units = [None, u.deg, u.deg]
                 ringtable = table.QTable(
@@ -391,13 +389,13 @@ def _parse_result(self, response, verbose=None):
 
             # Neptune ring arcs data
             elif group.startswith("Courage"):
-                lines = group.split("\n")
+                lines = group.split(os.linesep)[:5] #requires explicit split by os.linesep because windows and macos handle this text block differently
                 for i in range(len(lines)):
                     l = lines[i].split(":")
-                    ring = l[0].split("longitude")[0].strip(", \n")
+                    ring = l[0].split("longitude")[0].strip()
                     [min_angle, max_angle] = [
-                        float(s.strip(", \n"))
-                        for s in re.sub("[a-zA-Z]+", "", l[1]).strip(", \n()").split()
+                        float(s)
+                        for s in re.sub("[a-zA-Z]+", "", l[1]).split()
                     ]
                     if i == 0:
                         ringtable_names = ("ring", "min_angle", "max_angle")

astroquery/solarsystem/pds/tests/test_pds.py

@@ -63,30 +63,8 @@ def test_ephemeris_query_Uranus(patch_request):
     # check system table
     systemtable = bodytable.meta
     assert np.allclose(
-        [
-            -56.12233,
-            -56.13586,
-            -56.13586,
-            -56.01577,
-            0.10924,
-            354.11072,
-            354.12204,
-            2947896667.0,
-            3098568884.0,
-            10335.713263,
-        ],
-        [
-            systemtable["sub_sun_lat"].to(u.deg).value,
-            systemtable["sub_sun_lat_min"].to(u.deg).value,
-            systemtable["sub_sun_lat_max"].to(u.deg).value,
-            systemtable["opening_angle"].to(u.deg).value,
-            systemtable["phase_angle"].to(u.deg).value,
-            systemtable["sub_sun_lon"].to(u.deg).value,
-            systemtable["sub_obs_lon"].to(u.deg).value,
-            systemtable["d_sun"].to(u.km).value,
-            systemtable["d_obs"].to(u.km).value,
-            systemtable["light_time"].to(u.second).value,
-        ],
+        [-56.12233, -56.13586, -56.13586, -56.01577, 0.10924, 354.11072, 354.12204, 2947896667.0, 3098568884.0, 10335.713263, ],
+        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value, systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value, systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value, systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value, systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
         rtol=1e-2,
     )
 
@@ -95,30 +73,8 @@ def test_ephemeris_query_Uranus(patch_request):
     assert mab["NAIF ID"] == 726
     assert mab["Body"] == "Mab"
     assert np.allclose(
-        [
-            42.011201,
-            15.801323,
-            5.368,
-            0.623,
-            223.976,
-            55.906,
-            223.969,
-            56.013,
-            0.10932,
-            3098.514,
-        ],
-        [
-            mab["RA (deg)"].to(u.deg).value,
-            mab["Dec (deg)"].to(u.deg).value,
-            mab["dRA"].to(u.arcsec).value,
-            mab["dDec"].to(u.arcsec).value,
-            mab["sub_obs_lon"].to(u.deg).value,
-            mab["sub_obs_lat"].to(u.deg).value,
-            mab["sub_sun_lon"].to(u.deg).value,
-            mab["sub_sun_lat"].to(u.deg).value,
-            mab["phase"].to(u.deg).value,
-            mab["distance"].to(u.km * 1e6).value,
-        ],
+        [42.011201, 15.801323, 5.368, 0.623, 223.976, 55.906, 223.969, 56.013, 0.10932, 3098.514, ],
+        [mab["RA (deg)"].to(u.deg).value, mab["Dec (deg)"].to(u.deg).value, mab["dRA"].to(u.arcsec).value, mab["dDec"].to(u.arcsec).value, mab["sub_obs_lon"].to(u.deg).value, mab["sub_obs_lat"].to(u.deg).value, mab["sub_sun_lon"].to(u.deg).value, mab["sub_sun_lat"].to(u.deg).value, mab["phase"].to(u.deg).value, mab["distance"].to(u.km * 1e6).value, ],
         rtol=1e-2,
     )
 
@@ -139,30 +95,8 @@ def test_ephemeris_query_Pluto(patch_request):
     systemtable = bodytable.meta
     # check system table
     assert np.allclose(
-        [
-            57.57737,
-             57.56961,
-            57.56961,
-            56.50534,
-            1.64048,
-            116.55873,
-            118.8369,
-            5142696000,
-            5114486810,
-            17060.091666,
-        ],
-        [
-            systemtable["sub_sun_lat"].to(u.deg).value,
-            systemtable["sub_sun_lat_min"].to(u.deg).value,
-            systemtable["sub_sun_lat_max"].to(u.deg).value,
-            systemtable["opening_angle"].to(u.deg).value,
-            systemtable["phase_angle"].to(u.deg).value,
-            systemtable["sub_sun_lon"].to(u.deg).value,
-            systemtable["sub_obs_lon"].to(u.deg).value,
-            systemtable["d_sun"].to(u.km).value,
-            systemtable["d_obs"].to(u.km).value,
-            systemtable["light_time"].to(u.second).value,
-        ],
+        [57.57737, 57.56961, 57.56961, 56.50534, 1.64048, 116.55873, 118.8369, 5142696000, 5114486810, 17060.091666, ],
+        [systemtable["sub_sun_lat"].to(u.deg).value, systemtable["sub_sun_lat_min"].to(u.deg).value, systemtable["sub_sun_lat_max"].to(u.deg).value, systemtable["opening_angle"].to(u.deg).value, systemtable["phase_angle"].to(u.deg).value, systemtable["sub_sun_lon"].to(u.deg).value, systemtable["sub_obs_lon"].to(u.deg).value, systemtable["d_sun"].to(u.km).value, systemtable["d_obs"].to(u.km).value, systemtable["light_time"].to(u.second).value, ],
         rtol=1e-2,
     )
 
@@ -171,30 +105,8 @@ def test_ephemeris_query_Pluto(patch_request):
     assert styx["NAIF ID"] == 905
     assert styx["Body"] == "Styx"
     assert np.allclose(
-        [
-            296.212477,
-            -22.93533,
-            -0.557,
-            -1.259,
-            350.443,
-            56.472,
-            352.72,
-            57.544,
-            1.64047,
-            5114.509238,
-        ],
-        [
-            styx["RA (deg)"].to(u.deg).value,
-            styx["Dec (deg)"].to(u.deg).value,
-            styx["dRA"].to(u.arcsec).value,
-            styx["dDec"].to(u.arcsec).value,
-            styx["sub_obs_lon"].to(u.deg).value,
-            styx["sub_obs_lat"].to(u.deg).value,
-            styx["sub_sun_lon"].to(u.deg).value,
-            styx["sub_sun_lat"].to(u.deg).value,
-            styx["phase"].to(u.deg).value,
-            styx["distance"].to(u.km * 1e6).value,
-        ],
+        [296.212477, -22.93533, -0.557, -1.259, 350.443, 56.472, 352.72, 57.544, 1.64047, 5114.509238, ],
+        [styx["RA (deg)"].to(u.deg).value, styx["Dec (deg)"].to(u.deg).value, styx["dRA"].to(u.arcsec).value, styx["dDec"].to(u.arcsec).value, styx["sub_obs_lon"].to(u.deg).value, styx["sub_obs_lat"].to(u.deg).value, styx["sub_sun_lon"].to(u.deg).value, styx["sub_sun_lat"].to(u.deg).value, styx["phase"].to(u.deg).value, styx["distance"].to(u.km * 1e6).value, ],
         rtol=1e-2,
     )
 
@@ -214,27 +126,10 @@ def test_ephemeris_query_Neptune(patch_request):
     )
 
     assert np.allclose(
-                    [63.81977,
-                     55.01978,
-                     44.21976,
-                     40.41978,
-                     26.41978,
-                     64.81977,
-                     59.11976,
-                     45.21976,
-                     43.41978,
-                     36.01978],
-                     [ringtable[ringtable.loc_indices["Courage"]]["min_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Liberte"]]["min_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Egalite A"]]["min_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Egalite B"]]["min_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Fraternite"]]["min_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Courage"]]["max_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Liberte"]]["max_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Egalite A"]]["max_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Egalite B"]]["max_angle"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["Fraternite"]]["max_angle"].to(u.deg).value,
-                      ], rtol=1e-3)
+                    [63.81977, 55.01978, 44.21976, 40.41978, 26.41978, 64.81977, 59.11976, 45.21976, 43.41978, 36.01978],
+                     [ringtable[ringtable.loc_indices["Courage"]]["min_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Liberte"]]["min_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Egalite A"]]["min_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Egalite B"]]["min_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Fraternite"]]["min_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Courage"]]["max_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Liberte"]]["max_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Egalite A"]]["max_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Egalite B"]]["max_angle"].to(u.deg).value, ringtable[ringtable.loc_indices["Fraternite"]]["max_angle"].to(u.deg).value, ],
+                     rtol=1e-3
+                     )
 
 
 def test_ephemeris_query_Saturn(patch_request):
@@ -247,13 +142,10 @@ def test_ephemeris_query_Saturn(patch_request):
     )
 
     assert np.allclose(
-                    [249.23097,
-                     250.34081
-                     ],
-                     [
-                     ringtable[ringtable.loc_indices["F"]]["pericenter"].to(u.deg).value,
-                     ringtable[ringtable.loc_indices["F"]]["ascending node"].to(u.deg).value
-                     ], rtol=1e-3)
+                    [249.23097, 250.34081],
+                     [ringtable[ringtable.loc_indices["F"]]["pericenter"].to(u.deg).value, ringtable[ringtable.loc_indices["F"]]["ascending node"].to(u.deg).value],
+                     rtol=1e-3
+                     )
 
 
 def test_ephemeris_query_payload():