Merge pull request #2339 from bsipocz/atomic_fix_default_values

Fix atomic caching infinite loop

Author: bsipocz

astroquery/atomic/core.py

@@ -29,7 +29,7 @@ def __init__(self):
         super(AtomicLineListClass, self).__init__()
         self.__default_form_values = None
 
-    def query_object(self, wavelength_range=None, wavelength_type=None, wavelength_accuracy=None, element_spectrum=None,
+    def query_object(self, *, wavelength_range=None, wavelength_type=None, wavelength_accuracy=None, element_spectrum=None,
                      minimal_abundance=None, depl_factor=None, lower_level_energy_range=None,
                      upper_level_energy_range=None, nmax=None, multiplet=None, transitions=None,
                      show_fine_structure=None, show_auto_ionizing_transitions=None,
@@ -161,12 +161,13 @@ def query_object(self, wavelength_range=None, wavelength_type=None, wavelength_a
             output_columns=output_columns, cache=cache,
             get_query_payload=get_query_payload)
         if get_query_payload:
-            return input
+            return response
+
         table = self._parse_result(response)
         return table
 
     @prepend_docstr_nosections(query_object.__doc__)
-    def query_object_async(self, wavelength_range=None, wavelength_type='', wavelength_accuracy=None,
+    def query_object_async(self, *, wavelength_range=None, wavelength_type='', wavelength_accuracy=None,
                            element_spectrum=None, minimal_abundance=None, depl_factor=None,
                            lower_level_energy_range=None, upper_level_energy_range=None, nmax=None, multiplet=None,
                            transitions=None, show_fine_structure=None, show_auto_ionizing_transitions=None,
@@ -178,7 +179,7 @@ def query_object_async(self, wavelength_range=None, wavelength_type='', waveleng
         response : `requests.Response`
             The HTTP response returned from the service.
         """
-        default_values = self._default_form_values
+        default_values = self._default_form_values()
         wltype = (wavelength_type or default_values.get('air', '')).lower()
         if wltype in ('air', 'vacuum'):
             air = wltype.capitalize()
@@ -196,8 +197,8 @@ def query_object_async(self, wavelength_range=None, wavelength_type='', waveleng
             raise ValueError('Invalid parameter "transitions": {0!r}'
                              .format(transitions))
         if transitions is None:
-            _type = self._default_form_values.get('type')
-            type2 = self._default_form_values.get('type2')
+            _type = default_values.get('type')
+            type2 = default_values.get('type2')
         else:
             s = str(transitions)
             if len(s.split(',')) > 1:
@@ -219,7 +220,7 @@ def query_object_async(self, wavelength_range=None, wavelength_type='', waveleng
         if upper_level_erange is not None:
             upper_level_erange = upper_level_erange.to(
                 u.cm ** -1, equivalencies=u.spectral()).value
-        input = {
+        input_payload = {
             'wavl': ' '.join(map(str, wlrange_in_angstroms)),
             'wave': 'Angstrom',
             'air': air,
@@ -241,12 +242,12 @@ def query_object_async(self, wavelength_range=None, wavelength_type='', waveleng
             'tptype': 'as_a',
         }
         if get_query_payload:
-            return input
-        response = self._submit_form(input, cache=cache)
+            return input_payload
+        response = self._submit_form(input_payload, cache=cache)
         return response
 
     def _parse_result(self, response):
-        data = StringIO(BeautifulSoup(response.text, 'html5').find('pre').text.strip())
+        data = StringIO(BeautifulSoup(response.text, features='html5lib').find('pre').text.strip())
         # `header` is e.g.:
         # "u'-LAMBDA-VAC-ANG-|-SPECTRUM--|TT|--------TERM---------|---J-J---|----LEVEL-ENERGY--CM-1----'"
         # `colnames` is then
@@ -258,7 +259,7 @@ def _parse_result(self, response):
         colnames = [colname.strip('-').replace('-', ' ')
                     for colname in header.split('|') if colname.strip()]
         indices = [i for i, c in enumerate(header) if c == '|']
-        input = []
+        result_data = []
         for line in data:
             row = []
             for start, end in zip([0] + indices, indices + [None]):
@@ -271,45 +272,46 @@ def _parse_result(self, response):
                     # maintain table dimensions when data missing
                     row.append('None')
             if row:
-                input.append('\t'.join(row))
-        if input:
-            return ascii.read(input, data_start=0, delimiter='\t',
+                result_data.append('\t'.join(row))
+        if result_data:
+            return ascii.read(result_data, data_start=0, delimiter='\t',
                               names=colnames, fast_reader=False)
         else:
             # return an empty table if the query yielded no results
             return Table()
 
-    def _submit_form(self, input=None, cache=True):
+    def _submit_form(self, input_data=None, cache=True):
         """Fill out the form of the SkyView site and submit it with the
-        values given in `input` (a dictionary where the keys are the form
+        values given in ``input_data`` (a dictionary where the keys are the form
         element's names and the values are their respective values).
 
         """
-        if input is None:
-            input = {}
-        # only overwrite payload's values if the `input` value is not None
+        if input_data is None:
+            input_data = {}
+        # only overwrite payload's values if the ``input_data`` value is not None
         # to avoid overwriting of the form's default values
-        payload = self._default_form_values.copy()
-        for k, v in input.items():
+        payload = self._default_form_values().copy()
+        for k, v in input_data.items():
             if v is not None:
                 payload[k] = v
-        url = urlparse.urljoin(self.FORM_URL, self._default_form.get('action'))
+        url = self._form_action_url
         log.debug(f"final payload = {payload} from url={url}")
         response = self._request("POST", url=url, data=payload,
                                  timeout=self.TIMEOUT, cache=cache)
         log.debug("Retrieved data from POST request")
         return response
 
-    @property
     def _default_form_values(self):
-
         if self.__default_form_values is None:
-            response = self._request("GET", url=self.FORM_URL, data={},
-                                     timeout=self.TIMEOUT, cache=True)
-            bs = BeautifulSoup(response.text, 'html5')
-            self._default_form = form = bs.find('form')
-            self.__default_form_values = self._get_default_form_values(form)
-
+            response = self._request("GET", url=self.FORM_URL, params={},
+                                     timeout=self.TIMEOUT, cache=False)
+            bs = BeautifulSoup(response.text, features='html5lib')
+            form = bs.find('form')
+            default_form_values = self._get_default_form_values(form)
+            self._form_action_url = urlparse.urljoin(self.FORM_URL, form.get('action'))
+            self.__default_form_values = default_form_values
+        else:
+            raise ValueError(self.__default_form_values)
         return self.__default_form_values
 
     def _get_default_form_values(self, form):