Merge pull request #3307 from bsipocz/MAINT_skybot_votable

BUG: fixing parsing special object names for skybot

Author: bsipocz

CHANGES.rst

@@ -35,6 +35,15 @@ heasarc
 - Heasarc.locate_data returns empty rows with an error in the error_message column if there are
   no data associated with that row rather than filtering it out. [#3275]
 
+imcce
+^^^^^
+
+- Fix parsing SkyBot results that include objects with special characters in
+  their names. [#3307]
+
+- Changing RuntimeError to NoResultsWarning when an empty result is
+  returned. [#3307]
+
 utils.tap
 ^^^^^^^^^
 
@@ -48,7 +57,7 @@ mast
 
 - Added ``resolver`` parameter to query methods to specify the resolver to use when resolving object names to coordinates. [#3292]
 
-- Added ``resolve_all`` parameter to ``MastClass.resolve_object`` to resolve object names and return 
+- Added ``resolve_all`` parameter to ``MastClass.resolve_object`` to resolve object names and return
   coordinates for all available resolvers. [#3292]
 
 

astroquery/imcce/__init__.py

@@ -8,7 +8,6 @@
 """
 
 from astropy import config as _config
-import astropy.units as u
 
 
 class Conf(_config.ConfigNamespace):
@@ -31,45 +30,30 @@ class Conf(_config.ConfigNamespace):
     # SkyBoT configuration
 
     # dictionary for field name and unit conversions using 'output=all`
-    field_names = {'Num': 'Number',
-                   'Name': 'Name',
-                   'RA(h)': 'RA',
-                   'DE(deg)': 'DEC',
-                   'Class': 'Type',
-                   'Mv': 'V',
-                   'Err(arcsec)': 'posunc',
-                   'd(arcsec)': 'centerdist',
-                   'dRA(arcsec/h)': 'RA_rate',
-                   'dDEC(arcsec/h)': 'DEC_rate',
-                   'Dg(ua)': 'geodist',
-                   'Dh(ua)': 'heliodist',
-                   'Phase(deg)': 'alpha',
-                   'SunElong(deg)': 'elong',
-                   'x(au)': 'x',
-                   'y(au)': 'y',
-                   'z(au)': 'z',
-                   'vx(au/d)': 'vx',
-                   'vy(au/d)': 'vy',
-                   'vz(au/d)': 'vz',
-                   'Ref. Epoch(JD)': 'epoch'}
-    field_units = {'RA': u.deg,  # after conversion to deg
-                   'DEC': u.deg,  # after conversion to deg
-                   'V': u.mag,
-                   'posunc': u.arcsec,
-                   'centerdist': u.arcsec,
-                   'RA_rate': u.arcsec/u.hour,
-                   'DEC_rate': u.arcsec/u.hour,
-                   'geodist': u.au,
-                   'heliodist': u.au,
-                   'alpha': u.degree,
-                   'elong': u.degree,
-                   'x': u.au,
-                   'y': u.au,
-                   'z': u.au,
-                   'vx': u.au/u.day,
-                   'vy': u.au/u.day,
-                   'vz': u.au/u.day,
-                   'epoch': u.day}
+    field_names = {'num': 'Number',
+                   'name': 'Name',
+                   'ra': 'RA',
+                   'de': 'DEC',
+                   'class': 'Type',
+                   'magV': 'V',
+                   'errpos': 'posunc',
+                   'angdist': 'centerdist',
+                   'dracosdec': 'RA_rate',
+                   'ddec': 'DEC_rate',
+                   'dgeo': 'geodist',
+                   'dhelio': 'heliodist',
+                   'phase': 'alpha',
+                   'solelong': 'elong',
+                   'px': 'x',
+                   'py': 'y',
+                   'pz': 'z',
+                   'vx': 'vx',
+                   'vy': 'vy',
+                   'vz': 'vz',
+                   'jdref': 'epoch',
+                   '_raj2000': '_raj2000',
+                   '_decj2000': '_decj2000',
+                   'externallink': 'externallink'}
 
 
 conf = Conf()

astroquery/imcce/core.py

@@ -6,14 +6,16 @@
 from io import BytesIO
 
 from astropy.table import QTable, MaskedColumn
-from astropy.io import ascii
 from astropy.time import Time
 from astropy.io.votable import parse
 import astropy.units as u
 from astropy.coordinates import SkyCoord, Angle
+from astropy.utils.exceptions import AstropyUserWarning
+
+from astroquery.exceptions import NoResultsWarning
+from astroquery.query import BaseQuery
+from astroquery.utils import async_to_sync, commons
 
-from ..query import BaseQuery
-from ..utils import async_to_sync, commons
 from . import conf
 
 __all__ = ['Miriade', 'MiriadeClass', 'Skybot', 'SkybotClass']
@@ -599,7 +601,7 @@ def cone_search_async(self,
                            + str(int(find_comets)),
                            '-refsys': 'EQJ2000',
                            '-output': 'all',
-                           '-mime': 'text'}
+                           '-mime': 'votable'}
 
         # check for diagnostic flags
         if get_query_payload:
@@ -611,42 +613,42 @@ def cone_search_async(self,
                                  params=request_payload,
                                  timeout=TIMEOUT, cache=cache)
 
+        response.raise_for_status()
+
         self._uri = response.url
 
         return response
 
     def _parse_result(self, response, *, verbose=False):
         """
-        internal wrapper to parse queries
+        internal wrapper to parse queries.
         """
 
         if self._get_raw_response:
             return response.text
 
-        # intercept error messages
-        response_txt = response.text.split('\n')[2:-1]
-        if len(response_txt) < 3 and len(response_txt[-1].split('|')) < 21:
-            raise RuntimeError(response_txt[-1])
+        with warnings.catch_warnings():
+            # We deal with RA/DEC manually
+            warnings.filterwarnings("ignore", category=AstropyUserWarning,
+                                    message=r"column ra|(column de) has a unit but is kept as a MaskedColumn")
+            results = QTable.read(BytesIO(response.content), format='votable')
 
-        names = response_txt[0].replace('# ', '').strip().split(' | ')
-        results = ascii.read(response_txt[1:], delimiter='|',
-                             names=names, fast_reader=False)
-        results = QTable(results)
+        if len(results) == 0:
+            warnings.warn("No objects were found with the query constraints.", NoResultsWarning)
+            return results
 
         # convert coordinates to degrees
-        coo = SkyCoord(ra=results['RA(h)'], dec=results['DE(deg)'],
+        coo = SkyCoord(ra=results['ra'], dec=results['de'],
                        unit=(u.hourangle, u.deg), frame='icrs')
-        results['RA(h)'] = coo.ra.deg
-        results['DE(deg)'] = coo.dec.deg
+        results['ra'] = coo.ra.deg
+        results['ra'].unit = u.deg
+        results['de'] = coo.dec.deg
+        results['de'].unit = u.deg
 
         colnames = results.columns[:]
         for fieldname in colnames:
             # apply field name change
             results.rename_column(fieldname, conf.field_names[fieldname])
-            # apply unit, if available
-            if conf.field_names[fieldname] in conf.field_units:
-                results[conf.field_names[fieldname]].unit = conf.field_units[
-                    conf.field_names[fieldname]]
 
         # convert object numbers to int
         # unnumbered asteroids return as non numeric values ('-')