MAINT: Minor code cleanup, and fixing tests and adding changelog

Author: bsipocz

CHANGES.rst

@@ -90,6 +90,8 @@ jplhorizons
 - Deprecate ``get_raw_response`` options in query methods.  The raw response may
   be retrieved from the _async() methods. [#2418]
 
+- Adding ``optional_setting`` kwarg to the ephemerides methods to allow
+  passing additional settings. [#1802]
 jplsbdb
 ^^^^^^^
 

astroquery/jplhorizons/core.py

@@ -628,9 +628,6 @@ def ephemerides_async(self, airmass_lessthan=99,
 
         # inject optional settings if provided
         if optional_settings:
-            assert isinstance(
-                optional_settings, dict
-            ), "optional_settings should be a dict"
             for key, value in optional_settings.items():
                 request_payload[key] = value
 

astroquery/jplhorizons/tests/test_jplhorizons.py

@@ -197,10 +197,8 @@ def test_ephemerides_query_payload_with_optional_settings():
                                        'stop': '2080-02-01',
                                        'step': '3h'})
 
-    optional_settings = {
-        "R_T_S_ONLY": "TVH",
-        "TIME_DIGITS": "SECONDS",
-    }
+    optional_settings = {"R_T_S_ONLY": "TVH", "TIME_DIGITS": "SECONDS"}
+
     res = obj.ephemerides(airmass_lessthan=1.2, skip_daylight=True,
                           closest_apparition=True,
                           max_hour_angle=10,
@@ -209,8 +207,8 @@ def test_ephemerides_query_payload_with_optional_settings():
                           optional_settings=optional_settings)
 
     assert res == OrderedDict([
-        ('batch', 1),
-        ('TABLE_TYPE', 'OBSERVER'),
+        ('format', 'text'),
+        ('EPHEM_TYPE', 'OBSERVER'),
         ('QUANTITIES', "'1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,"
                        "18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,"
                        "33,34,35,36,37,38,39,40,41,42,43'"),
@@ -221,7 +219,7 @@ def test_ephemerides_query_payload_with_optional_settings():
         ('CAL_FORMAT', 'BOTH'),
         ('ANG_FORMAT', 'DEG'),
         ('APPARENT', 'AIRLESS'),
-        ('REF_SYSTEM', 'J2000'),
+        ('REF_SYSTEM', 'ICRF'),
         ('EXTRA_PREC', 'NO'),
         ('CENTER', "'290'"),
         ('START_TIME', '"2080-01-01"'),