Skip to content

Commit 36b2a4e

Browse files
authored
Merge pull request #2654 from bsipocz/MAINT_https_for_sdss
FIX: switching to https for sdss to avoid query issues
2 parents e4612b4 + 315c83f commit 36b2a4e

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

CHANGES.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ oac
151151
- Fix bug in parsing events that contain html tags (e.g. in their alias
152152
field). [#2423]
153153

154+
sdss
155+
^^^^
156+
157+
- Switching to https to avoid issues originating in relying on server side
158+
redirects. [#2654]
159+
154160
simbad
155161
^^^^^^
156162

astroquery/sdss/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class Conf(_config.ConfigNamespace):
1111
Configuration parameters for `astroquery.sdss`.
1212
"""
1313
skyserver_baseurl = _config.ConfigItem(
14-
'http://skyserver.sdss.org',
14+
'https://skyserver.sdss.org',
1515
'Base URL for catalog-related queries like SQL and Cross-ID.')
1616
sas_baseurl = _config.ConfigItem(
1717
'https://data.sdss.org/sas',

astroquery/sdss/tests/test_sdss.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,25 +123,25 @@ def data_path(filename):
123123
# interfaces are supported for DR11."
124124
def url_tester(data_release):
125125
if data_release < 10:
126-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_sql.asp'
126+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.asp'
127127
if data_release == 10:
128-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_sql.aspx'
128+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_sql.aspx'
129129
if data_release == 11:
130130
return
131131
if data_release >= 12:
132-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/x_results.aspx'
132+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/x_results.aspx'
133133
assert sdss.SDSS._last_url == baseurl.format(data_release)
134134

135135

136136
def url_tester_crossid(data_release):
137137
if data_release < 10:
138-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.asp'
138+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.asp'
139139
if data_release == 10:
140-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.aspx'
140+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/crossid/x_crossid.aspx'
141141
if data_release == 11:
142142
return
143143
if data_release >= 12:
144-
baseurl = 'http://skyserver.sdss.org/dr{}/en/tools/search/X_Results.aspx'
144+
baseurl = 'https://skyserver.sdss.org/dr{}/en/tools/search/X_Results.aspx'
145145
assert sdss.SDSS._last_url == baseurl.format(data_release)
146146

147147

0 commit comments

Comments
 (0)