Skip to content

Commit 2c588eb

Browse files
committed
fix whitespace in docs, always return list from _batched_response
ignore doctest outputs
1 parent ad6c612 commit 2c588eb

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

astroquery/mast/missions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,12 @@ def get_product_list_async(self, datasets):
444444
max_batch=1000,
445445
param_key="dataset_ids",
446446
request_func=lambda p: self._service_api_connection.missions_request_async(self.service, p),
447-
extract_func=lambda r: r, # missions_request_async already returns one result
447+
extract_func=lambda r: [r], # missions_request_async already returns one result
448448
desc=f"Fetching products for {len(datasets)} unique datasets"
449449
)
450-
return results
450+
451+
# Return a list of responses only if multiple requests were made
452+
return results[0] if len(results) == 1 else results
451453

452454
def get_unique_product_list(self, datasets):
453455
"""

astroquery/mast/utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ def _batched_request(
135135

136136
# Extend results with new response
137137
new_resp = extract_func(resp)
138-
new_resp = new_resp if isinstance(new_resp, list) else [new_resp]
139138
results.extend(new_resp)
140139

141140
# Update progress bar

docs/mast/mast.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,31 +116,31 @@ across multiple requests, with results combined into the final return object.
116116
...
117117
>>> # Resolve a single object
118118
>>> coords = mast.resolve_object("M101", resolver="NED")
119-
>>> print(coords)
119+
>>> print(coords) # doctest: +IGNORE_OUTPUT
120120
<SkyCoord (ICRS): (ra, dec) in deg
121-
(210.80227, 54.34895)>
121+
(210.80227, 54.34895)>
122122
...
123123
>>> # Resolve multiple objects
124124
>>> coords_multi = mast.resolve_object(["M101", "M51"], resolver="SIMBAD")
125-
>>> pprint(coords_multi)
125+
>>> pprint(coords_multi) # doctest: +IGNORE_OUTPUT
126126
{'M101': <SkyCoord (ICRS): (ra, dec) in deg
127127
(210.802429, 54.34875)>,
128128
'M51': <SkyCoord (ICRS): (ra, dec) in deg
129129
(202.469575, 47.195258)>}
130130
...
131131
>>> # Resolve a single object with all resolvers
132132
>>> coords_dict = mast.resolve_object("M101", resolve_all=True)
133-
>>> pprint(coords_dict)
133+
>>> pprint(coords_dict) # doctest: +IGNORE_OUTPUT
134134
{'NED': <SkyCoord (ICRS): (ra, dec) in deg
135-
(210.80227, 54.34895)>,
136-
'SIMBAD': <SkyCoord (ICRS): (ra, dec) in deg
137-
(210.802429, 54.34875)>,
138-
'SIMBADCFA': <SkyCoord (ICRS): (ra, dec) in deg
139-
(210.802429, 54.34875)>}
135+
(210.80227, 54.34895)>,
136+
'SIMBAD': <SkyCoord (ICRS): (ra, dec) in deg
137+
(210.802429, 54.34875)>,
138+
'SIMBADCFA': <SkyCoord (ICRS): (ra, dec) in deg
139+
(210.802429, 54.34875)>}
140140
...
141141
>>> # Resolve multiple objects with all resolvers
142142
>>> coords_dict_multi = mast.resolve_object(["M101", "M51"], resolve_all=True)
143-
>>> pprint(coords_dict_multi)
143+
>>> pprint(coords_dict_multi) # doctest: +IGNORE_OUTPUT
144144
{'M101': {'NED': <SkyCoord (ICRS): (ra, dec) in deg
145145
(210.80227, 54.34895)>,
146146
'SIMBAD': <SkyCoord (ICRS): (ra, dec) in deg

0 commit comments

Comments
 (0)