Skip to content

Commit 0d2d015

Browse files
committed
update Exceptions
1 parent e54a51b commit 0d2d015

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

astroquery/linelists/cdms/core.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# import configurable items declared in __init__.py
1212
from astroquery.linelists.cdms import conf
1313
from astroquery.jplspec import lookup_table
14+
from astroquery.exceptions import InvalidQueryError, EmptyResponseError
1415

1516

1617
__all__ = ['CDMS', 'CDMSClass']
@@ -104,7 +105,7 @@ def query_lines_async(self, min_frequency, max_frequency, *,
104105
min_frequency = min_frequency.to(u.GHz, u.spectral())
105106
max_frequency = max_frequency.to(u.GHz, u.spectral())
106107
if min_frequency > max_frequency:
107-
raise ValueError("min_frequency must be less than max_frequency")
108+
raise InvalidQueryError("min_frequency must be less than max_frequency")
108109

109110
payload['MinNu'] = min_frequency.value
110111
payload['MaxNu'] = max_frequency.value
@@ -128,9 +129,9 @@ def query_lines_async(self, min_frequency, max_frequency, *,
128129
payload['Molecules'] = tuple(f"{val:06d} {key}"
129130
for key, val in luts.items())[0]
130131
if len(molecule) == 0:
131-
raise ValueError('No matching species found. Please '
132-
'refine your search or read the Docs '
133-
'for pointers on how to search.')
132+
raise InvalidQueryError('No matching species found. Please '
133+
'refine your search or read the Docs '
134+
'for pointers on how to search.')
134135
else:
135136
payload['Molecules'] = molecule
136137

@@ -153,7 +154,7 @@ def query_lines_async(self, min_frequency, max_frequency, *,
153154
ok = True
154155
break
155156
if not ok:
156-
raise ValueError("Did not find table in response")
157+
raise EmptyResponseError("Did not find table in response")
157158

158159
baseurl = self.URL.split('cgi-bin')[0]
159160
fullurl = f'{baseurl}/{url}'
@@ -203,7 +204,7 @@ def _parse_result(self, response, verbose=False):
203204
"""
204205

205206
if 'Zero lines were found' in response.text:
206-
raise ValueError(f"Response was empty; message was '{response.text}'.")
207+
raise EmptyResponseError(f"Response was empty; message was '{response.text}'.")
207208

208209
soup = BeautifulSoup(response.text, 'html.parser')
209210
text = soup.find('pre').text

0 commit comments

Comments
 (0)