Remove deprecation warnings and warn in documentation.

Remove 'id' as an ``id_type`` option (it had no effect).

Author: mkelley

CHANGES.rst

@@ -34,15 +34,13 @@ jplhorizons
   Included in this update, the default reference system is changed from
   J2000 to ICRF, following API documentation. [#2154]
 
-- Query `id_type` behavior and options are changing:
-  - `'majorbody'` has been renamed to `''` (empty string) to represent the
-    Horizons default behavior. The Horizons default to search major bodies
-    first, then fall back to a small body search.  Horizons does not have
-    a major body only search.
-  - The default behavior was `'smallbody'` but this will be changed to the
-    Horizons default in a future version.
-  - Deprecation warnings are raised if `id_type` is `'majorbody'` or
-    was not specified by the user.
+- Query ``id_type`` behavior has changed:
+  - ``'majorbody'`` has been removed and the equivalent functionality
+    replaced ``None``.  This implements the Horizons default, which is to
+    search for major bodies first, then fall back to a small body search when
+    no matches are found.  Horizons does not have a major body only search.
+  - The default value was ``'smallbody'`` but it is now ``None``, which
+    follows Horizons's default behavior.
 
 Infrastructure, Utility and Other Changes and Additions
 -------------------------------------------------------

astroquery/jplhorizons/core.py

@@ -12,7 +12,6 @@
 from astropy.table import Table, Column
 from astropy.io import ascii
 from astropy.time import Time
-from astropy.utils.exceptions import AstropyDeprecationWarning
 
 # 3. local imports - use relative imports
 # commonly required local imports shown below as example
@@ -30,7 +29,7 @@
 class HorizonsClass(BaseQuery):
     """
     A class for querying the
-    `JPL Horizons <https://ssd.jpl.nasa.gov/horizons.cgi>`_ service.
+    `JPL Horizons <https://ssd.jpl.nasa.gov/horizons/>`_ service.
     """
 
     TIMEOUT = conf.timeout
@@ -48,7 +47,7 @@ def __init__(self, id=None, location=None, epochs=None,
             orbital element or vector queries. Uses the same codes as JPL
             Horizons. If no location is provided, Earth's center is used for
             ephemerides queries and the Sun's center for elements and vectors
-            queries. Arbitrary topocentic coordinates for ephemerides queries
+            queries. Arbitrary topocentric coordinates for ephemerides queries
             can be provided in the format of a dictionary. The dictionary has to
             be of the form {``'lon'``: longitude in deg (East positive, West
             negative), ``'lat'``: latitude in deg (North positive, South
@@ -66,13 +65,12 @@ def __init__(self, id=None, location=None, epochs=None,
             time is used.
         id_type : str, optional
             Controls Horizons's object selection for ``id``
-            [HORIZONSDOC_SELECTION]_ .  Options: ``'majorbody'`` (DEPRECATED,
-            use ``''``), ``'designation'`` (small body designation), ``'name'``
-            (asteroid or comet name), ``'asteroid_name'``, ``'comet_name'``,
-            ``'id'`` (Horizons ID number), ``'smallbody'`` (asteroid and comet
-            search), or ``''`` (empty string; first search search planets,
-            natural satellites, spacecraft, and special cases, then small
-            bodies).
+            [HORIZONSDOC_SELECTION]_ .  Options: ``'designation'`` (small body
+            designation), ``'name'`` (asteroid or comet name),
+            ``'asteroid_name'``, ``'comet_name'``, ``'smallbody'`` (asteroid
+            and comet search), or ``None`` (first search search planets,
+            natural satellites, spacecraft, and special cases, and if no
+            matches, then search small bodies).
 
         References
         ----------
@@ -110,19 +108,9 @@ def __init__(self, id=None, location=None, epochs=None,
         self.epochs = epochs
 
         # check for id_type
-        if id_type is None:
-            warnings.warn('id_type was not specified, defaulting to a '
-            '"smallbody" search.  This behavior is deprecated and will be '
-            'changed to "" (empty string / Horizons default) in the future.',
-            AstropyDeprecationWarning)
-            id_type = 'smallbody'
-        elif id_type == 'majorbody':
-            warnings.warn('id_type "majorbody" is deprecated and will be '
-            'removed.  For the equivalent search behavior, use "" (empty '
-            'string).', AstropyDeprecationWarning)
-            id_type = ''
-        if id_type not in ['', 'smallbody', 'designation', 'name',
-                           'asteroid_name', 'comet_name', 'id']:
+
+        if id_type not in [None, 'smallbody', 'designation', 'name',
+                           'asteroid_name', 'comet_name']:
             raise ValueError('id_type ({:s}) not allowed'.format(id_type))
         self.id_type = id_type
 

docs/jplhorizons/jplhorizons.rst

@@ -6,12 +6,19 @@
 JPL Horizons Queries (`astroquery.jplhorizons`/astroquery.solarsystem.jpl.horizons)
 ***********************************************************************************
 
+.. Warning::
+
+   The default search behavior has changed.  In v0.4.3 and earlier, the default
+   ``id_type`` was ``'smallbody'``.  With v0.4.4, the default is ``None``, which
+   aligns with JPL Hoirizons's `default behavior
+   <https://ssd.jpl.nasa.gov/?horizons_doc#selection>`_: search major bodies
+   first, and if no major bodies are found, then search small bodies.
+
 .. Note::
 
    Due to serverside changes the ``jplhorizons`` module requires astroquery v0.4.1 or newer.
    Previous versions are not expected to function, please upgrade the package if you observe any issues.
 
-
 Overview
 ========