Skip to content

Commit 2ad220b

Browse files
committed
refactoring the sort_by syntax correction to live outside _build_catalogs_params
1 parent 011c3dc commit 2ad220b

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

astroquery/mast/services.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,15 @@ def service_request_async(self, service, params, page_size=None, page=None, use_
281281
if page_size is not None:
282282
catalogs_request.append(('pagesize', page_size))
283283

284+
# Updating syntax of sort_by inputs if sort direction
285+
# was specified
286+
if 'sort_by' in params.keys():
287+
new_sort_by = []
288+
for item in params['sort_by']:
289+
if item[0].lower() in ['asc', 'desc']:
290+
new_sort_by.append(item[1] + '.' + item[0])
291+
params['sort_by'] = new_sort_by
292+
284293
if not use_json:
285294
# Decompose filters, sort
286295
for prop, value in kwargs.items():
@@ -289,6 +298,7 @@ def service_request_async(self, service, params, page_size=None, page=None, use_
289298
else:
290299
headers['Content-Type'] = 'application/json'
291300
catalogs_request = params
301+
292302
response = self._request('POST', request_url, data=catalogs_request, headers=headers, use_json=use_json)
293303
return response
294304

@@ -317,11 +327,7 @@ def _build_catalogs_params(self, params):
317327
# Loop through each value if list
318328
if isinstance(value, list):
319329
for sort_item in value:
320-
# Determine if tuple with sort direction
321-
if isinstance(sort_item, tuple):
322-
catalog_params.append(('sort_by', sort_item[1] + '.' + sort_item[0]))
323-
else:
324-
catalog_params.append(('sort_by', sort_item))
330+
catalog_params.append(('sort_by', sort_item))
325331
else:
326332
# A single sort
327333
# Determine if tuple with sort direction

0 commit comments

Comments
 (0)