Skip to content

Commit fa816c7

Browse files
committed
Make all mission strings in esasky upper case again
1 parent 20fff66 commit fa816c7

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

astroquery/esasky/core.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,34 +1358,34 @@ def _sanitize_input_radius(self, radius):
13581358

13591359
def _sanitize_input_mission(self, missions):
13601360
if isinstance(missions, list):
1361-
return missions
1361+
return [m.upper() for m in missions]
13621362
if isinstance(missions, str):
13631363
if missions.lower() == self.__ALL_STRING:
13641364
return self.list_maps()
13651365
else:
1366-
return [missions]
1366+
return [missions.upper()]
13671367
raise ValueError("Mission must be either a string or a list of "
13681368
"missions")
13691369

13701370
def _sanitize_input_spectra(self, spectra):
13711371
if isinstance(spectra, list):
1372-
return spectra
1372+
return [s.upper() for s in spectra]
13731373
if isinstance(spectra, str):
13741374
if spectra.lower() == self.__ALL_STRING:
13751375
return self.list_spectra()
13761376
else:
1377-
return [spectra]
1377+
return [spectra.upper()]
13781378
raise ValueError("Spectra must be either a string or a list of "
13791379
"Spectra")
13801380

13811381
def _sanitize_input_catalogs(self, catalogs):
13821382
if isinstance(catalogs, list):
1383-
return catalogs
1383+
return [c.upper() for c in catalogs]
13841384
if isinstance(catalogs, str):
13851385
if catalogs.lower() == self.__ALL_STRING:
13861386
return self.list_catalogs()
13871387
else:
1388-
return [catalogs]
1388+
return [catalogs.upper()]
13891389
raise ValueError("Catalog must be either a string or a list of "
13901390
"catalogs")
13911391

@@ -1798,7 +1798,7 @@ def _store_query_result(self, query_result, names, descriptors, verbose=False, *
17981798
for name in names:
17991799
table = self._query(name=name, descriptors=descriptors, verbose=verbose, **kwargs)
18001800
if len(table) > 0:
1801-
query_result[name.upper()] = table
1801+
query_result[name] = table
18021802

18031803
def _get_observation_info(self):
18041804
return self._get_descriptors(category='observations')
@@ -1818,7 +1818,7 @@ def _get_descriptors(self, category):
18181818
join tap_schema.columns dec on d.table_name = dec.table_name
18191819
where d.category = '{}' and ra.ucd = 'pos.eq.ra;meta.main' and dec.ucd = 'pos.eq.dec;meta.main'
18201820
""".format(category)
1821-
return {d['mission']: {a: d[a] for a in d.keys()} for d in self.query(query)}
1821+
return {d['mission'].upper(): {a: d[a] for a in d.keys()} for d in self.query(query)}
18221822

18231823
def _table_for_mission(self, mission, descriptors):
18241824
tables = {d['mission'].lower(): d['table_name'] for d in descriptors.values()}

0 commit comments

Comments
 (0)