Merge pull request #2769 from keflavich/atomic_url

Fix atomic URL

Author: bsipocz

CHANGES.rst

@@ -47,6 +47,11 @@ alfalfa
 - Removal of the non-functional ``get_spectrym`` method as that service has
   disappeared. [#2578]
 
+atomic
+^^^^^^
+
+- Change URL and improve error handling. [#2769]
+
 esa.hubble
 ^^^^^^^^^^
 

astroquery/atomic/__init__.py

@@ -77,7 +77,7 @@ class Conf(_config.ConfigNamespace):
     Configuration parameters for `astroquery.atomic`.
     """
     url = _config.ConfigItem(
-        'https://www.pa.uky.edu/~peter/atomic/',
+        'https://linelist.pa.uky.edu/atomic/',
         'Atomic Line List URL')
 
     timeout = _config.ConfigItem(

astroquery/atomic/core.py

@@ -248,7 +248,18 @@ def query_object_async(self, *, wavelength_range=None, wavelength_type='', wavel
         return response
 
     def _parse_result(self, response):
-        data = StringIO(BeautifulSoup(response.text, features='html5lib').find('pre').text.strip())
+
+        if 'ERROR: request form contains no information' in response.text:
+            raise ValueError("The server returned an error.  Please check the URL."
+                             f"   The full error message is {response.text}")
+        elif 'ERROR' in response.text:
+            raise ValueError(f"The server returned an error.  The full error message is {response.text}")
+
+        html_pre = BeautifulSoup(response.text, features='html5lib').find('pre')
+        if html_pre is None:
+            raise ValueError("Data format not recognized.  The <pre> tag was missing from the response.")
+
+        data = StringIO(html_pre.text.strip())
         # `header` is e.g.:
         # "u'-LAMBDA-VAC-ANG-|-SPECTRUM--|TT|--------TERM---------|---J-J---|----LEVEL-ENERGY--CM-1----'"
         # `colnames` is then
@@ -299,6 +310,7 @@ def _submit_form(self, input_data=None, cache=True):
         log.debug(f"final payload = {payload} from url={url}")
         response = self._request("POST", url=url, data=payload,
                                  timeout=self.TIMEOUT, cache=cache)
+        response.raise_for_status()
         log.debug("Retrieved data from POST request")
         return response