Skip to content

Commit 83f3b5b

Browse files
committed
refactor NRAO to use real querying and fix telescope config parsing
1 parent 033da27 commit 83f3b5b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

astroquery/nrao/core.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ def _args_to_payload(self, **kwargs):
197197
@prepend_docstr_noreturns(_args_to_payload.__doc__)
198198
def query_async(self,
199199
get_query_payload=False,
200+
cache=True,
200201
**kwargs):
201202
"""
202203
Returns
@@ -209,10 +210,8 @@ def query_async(self,
209210

210211
if get_query_payload:
211212
return request_payload
212-
response = commons.send_request(Nrao.DATA_URL,
213-
request_payload,
214-
Nrao.TIMEOUT,
215-
request_type='POST')
213+
response = self._request('POST', self.DATA_URL, params=request_payload,
214+
timeout=self.TIMEOUT, cache=cache)
216215
return response
217216

218217
@prepend_docstr_noreturns(_args_to_payload.__doc__)
@@ -255,9 +254,9 @@ def _parse_result(self, response, verbose=False):
255254
new_content = degrees_re.sub(r'unit="degrees" datatype="char" '
256255
'arraysize="*"', new_content)
257256
telconfig_re = re.compile(r'datatype="char" name="Telescope:config"')
258-
new_content = telconfig_re.sub(r'datatype="char"'
259-
'name="Telescope:config"'
260-
' arraysize="*"', new_content)
257+
new_content = telconfig_re.sub(r'datatype="unicodeChar" '
258+
'name="Telescope:config" '
259+
' arraysize="*" ', new_content)
261260

262261
datatype_mapping = {'integer':'long'}
263262

0 commit comments

Comments
 (0)