Skip to content

Commit ff18444

Browse files
authored
Addressing simplest review comments
1 parent aef5c0f commit ff18444

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ eso
8080
^^^
8181

8282
- Switch querying interface from WDB to TAP in querying functions. [#3339]
83-
- Allow plain ADQL queries via ``query_tap_service`` (with authentication as well). [#3339]
83+
- Allow plain ADQL queries via ``query_tap`` (with authentication as well). [#3339]
8484
- Cone search using ``cone_ra`, ``cone_dec`, ``cone_radius`` arguments. [#3339]
8585
- Retrieve record count before querying the archive, via ``count_only`` argument. [#3339]
8686
- Ask query functions to print the underlying ADQL queries without issuing them. [#3339]

astroquery/eso/core.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
from .utils import _UserParams, raise_if_coords_not_valid, _reorder_columns, \
4040
_raise_if_has_deprecated_keys, _build_adql_string, \
4141
DEFAULT_LEAD_COLS_PHASE3, DEFAULT_LEAD_COLS_RAW
42+
43+
44+
__all__ = ['Eso', 'EsoClass']
4245

4346

4447
class CalSelectorError(Exception):
@@ -319,7 +322,7 @@ def query_tap(self,
319322
return table_to_return
320323

321324
@unlimited_maxrec
322-
@deprecated_renamed_argument('cache', None, since='0.4.11')
325+
@deprecated_renamed_argument('cache', None, since='0.4.12')
323326
def list_instruments(self, cache=True) -> List[str]:
324327
"""
325328
List all the available instrument-specific queries offered by the ESO archive.
@@ -346,7 +349,7 @@ def list_instruments(self, cache=True) -> List[str]:
346349
return l_res
347350

348351
@unlimited_maxrec
349-
@deprecated_renamed_argument('cache', None, since='0.4.11')
352+
@deprecated_renamed_argument('cache', None, since='0.4.12')
350353
def list_surveys(self, *, cache=True) -> List[str]:
351354
"""
352355
List all the available surveys (phase 3) in the ESO archive.
@@ -408,7 +411,7 @@ def _query_on_allowed_values(
408411
return list(ret_table[0].values())[0] if user_params.count_only else ret_table
409412

410413
@deprecated_renamed_argument(('open_form', 'cache'), (None, None),
411-
since=['0.4.11', '0.4.11'])
414+
since=['0.4.12, '0.4.12'])
412415
def query_surveys(
413416
self,
414417
surveys: Union[List[str], str] = None, *,
@@ -498,7 +501,7 @@ def query_surveys(
498501
return t
499502

500503
@deprecated_renamed_argument(('open_form', 'cache'), (None, None),
501-
since=['0.4.11', '0.4.11'])
504+
since=['0.4.12', '0.4.12'])
502505
def query_main(
503506
self,
504507
instruments: Union[List[str], str] = None, *,
@@ -975,7 +978,7 @@ def retrieve_data(self, datasets, *, continuation=False, destination=None,
975978
return files[0] if files and len(files) == 1 and return_string else files
976979

977980
@deprecated_renamed_argument(('open_form', 'cache'), (None, None),
978-
since=['0.4.11', '0.4.11'])
981+
since=['0.4.12, '0.4.12'])
979982
def query_apex_quicklooks(self,
980983
project_id: Union[List[str], str] = None, *,
981984
columns: Union[List, str] = None,

0 commit comments

Comments
 (0)