Skip to content

Commit 0d2a717

Browse files
committed
http --> https
1 parent 513135b commit 0d2a717

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

astroquery/eso/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Conf(_config.ConfigNamespace):
1818
"",
1919
'Optional default username for ESO archive.')
2020
tap_url = _config.ConfigItem(
21-
"http://archive.eso.org/tap_obs",
21+
"https://archive.eso.org/tap_obs",
2222
'URL for TAP queries.')
2323
tap_url_dev = _config.ConfigItem(
2424
os.environ['TAP_URL_DEV'],

astroquery/eso/core.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ def query_tap_service(self,
253253
except pyvo.dal.exceptions.DALQueryError as e:
254254
raise pyvo.dal.exceptions.DALQueryError(f"\n\n\
255255
Error executing the following query:\n\n{query_str}\n\n\
256-
See examples here: http://archive.eso.org/tap_obs/examples\n\n") from e
256+
See examples here: https://archive.eso.org/tap_obs/examples\n\n") from e
257257
except Exception as e:
258258
raise RuntimeError(f"\n\n\
259259
Unknown exception {e} while executing the\
260260
following query: \n\n{query_str}\n\n\
261-
See examples here: http://archive.eso.org/tap_obs/examples\n\n") from e
261+
See examples here: https://archive.eso.org/tap_obs/examples\n\n") from e
262262

263263
if len(table_to_return) < 1:
264264
warnings.warn("Query returned no results", NoResultsWarning)
@@ -443,7 +443,7 @@ def get_headers(self, product_ids, *, cache=True):
443443
result = []
444444
for dp_id in product_ids:
445445
response = self._request(
446-
"GET", f"http://archive.eso.org/hdr?DpId={dp_id}",
446+
"GET", f"https://archive.eso.org/hdr?DpId={dp_id}",
447447
cache=cache)
448448
root = BeautifulSoup(response.content, 'html5lib')
449449
hdr = root.select('pre')[0].text
@@ -500,7 +500,8 @@ def _find_cached_file(filename: str) -> bool:
500500
files_to_check.append(filename.rsplit(".", 1)[0])
501501
for file in files_to_check:
502502
if os.path.exists(file):
503-
EsoClass.log_info(f"Found cached file {file}")
503+
logmsg = (f"Found cached file {file}")
504+
log.info(logmsg)
504505
return True
505506
return False
506507

astroquery/eso/tests/test_eso.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def data_path(filename):
3232
},
3333
'POST':
3434
{
35-
'http://archive.eso.org/wdb/wdb/eso/eso_archive_main/query': 'main_sgra_query.tbl',
36-
'http://archive.eso.org/wdb/wdb/eso/amber/query': 'amber_sgra_query.tbl',
37-
'http://archive.eso.org/wdb/wdb/adp/phase3_main/query': 'vvv_sgra_survey_response.tbl',
35+
'https://archive.eso.org/wdb/wdb/eso/eso_archive_main/query': 'main_sgra_query.tbl',
36+
'https://archive.eso.org/wdb/wdb/eso/amber/query': 'amber_sgra_query.tbl',
37+
'https://archive.eso.org/wdb/wdb/adp/phase3_main/query': 'vvv_sgra_survey_response.tbl',
3838
},
3939
'ADQL':
4040
{
@@ -211,7 +211,7 @@ def test_tap_url():
211211
if EsoClass.USE_DEV_TAP:
212212
assert url == "http://dfidev5.hq.eso.org:8123/tap_obs"
213213
else:
214-
assert url == "http://archive.eso.org/tap_obs"
214+
assert url == "https://archive.eso.org/tap_obs"
215215

216216

217217
def test_py2adql():

astroquery/eso/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def py2adql(table: str, columns: Union[List, str] = None,
6262
order_by: str = '', order_by_desc=True, top: int = None):
6363
"""
6464
Return the adql string corresponding to the parameters passed
65-
See adql examples at http://archive.eso.org/tap_obs/examples
65+
See adql examples at https://archive.eso.org/tap_obs/examples
6666
"""
6767
# validate ra, dec, radius
6868
if not are_coords_valid(ra, dec, radius):

0 commit comments

Comments
 (0)