From bdfbd9e2a1cf8ac2c2ae274d6aa4d78ed265b41e Mon Sep 17 00:00:00 2001 From: Fabien Engels Date: Tue, 24 Aug 2021 09:46:27 +0200 Subject: [PATCH] Use https in RESIF webservice url --- CHANGELOG.txt | 1 + obspy/CONTRIBUTORS.txt | 2 +- obspy/clients/fdsn/__init__.py | 2 +- obspy/clients/fdsn/header.py | 2 +- obspy/clients/fdsn/tests/test_eidaws_routing_client.py | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1d2700850be..0c5776e38f8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -60,6 +60,7 @@ Changes: * Inventory addition now consistently uses shallow copies (#2675, #2694) - obspy.clients.fdsn: * add URL mapping for IRISPH5 (see #2739) + * update RESIF URL mapping to use https - obspy.clients.seedlink: * Fix a bug in basic client when printing debug output (see #2734) - obspy.io.gse2: diff --git a/obspy/CONTRIBUTORS.txt b/obspy/CONTRIBUTORS.txt index 1d42fa63f2c..79444deee50 100644 --- a/obspy/CONTRIBUTORS.txt +++ b/obspy/CONTRIBUTORS.txt @@ -25,7 +25,7 @@ Danecek, Peter van Driel, Martin Egdorf, Sven Ely, Geoffrey -Engels, Fabian +Engels, Fabien Ermert, Laura Eulenfeld, Tom Fabbri, Tommaso diff --git a/obspy/clients/fdsn/__init__.py b/obspy/clients/fdsn/__init__.py index 74b464ca611..45be317b131 100644 --- a/obspy/clients/fdsn/__init__.py +++ b/obspy/clients/fdsn/__init__.py @@ -55,7 +55,7 @@ ODC http://www.orfeus-eu.org ORFEUS http://www.orfeus-eu.org RASPISHAKE https://fdsnws.raspberryshakedata.com -RESIF http://ws.resif.fr +RESIF https://ws.resif.fr SCEDC http://service.scedc.caltech.edu TEXNET http://rtserve.beg.utexas.edu UIB-NORSAR http://eida.geo.uib.no diff --git a/obspy/clients/fdsn/header.py b/obspy/clients/fdsn/header.py index 9a94e404b20..1bb76870879 100644 --- a/obspy/clients/fdsn/header.py +++ b/obspy/clients/fdsn/header.py @@ -112,7 +112,7 @@ class FDSNNoServiceException(FDSNException): "NOA": "http://eida.gein.noa.gr", "ODC": "http://www.orfeus-eu.org", "ORFEUS": "http://www.orfeus-eu.org", - "RESIF": "http://ws.resif.fr", + "RESIF": "https://ws.resif.fr", "RASPISHAKE": "https://fdsnws.raspberryshakedata.com", "SCEDC": "http://service.scedc.caltech.edu", "TEXNET": "http://rtserve.beg.utexas.edu", diff --git a/obspy/clients/fdsn/tests/test_eidaws_routing_client.py b/obspy/clients/fdsn/tests/test_eidaws_routing_client.py index d69b443c56a..8b6dbc409fd 100644 --- a/obspy/clients/fdsn/tests/test_eidaws_routing_client.py +++ b/obspy/clients/fdsn/tests/test_eidaws_routing_client.py @@ -49,7 +49,7 @@ def test_response_splitting(self): http://webservices.ingv.it/fdsnws/station/1/query NI * * * 2017-01-01T00:00:00 2017-01-01T00:10:00 -http://ws.resif.fr/fdsnws/station/1/query +https://ws.resif.fr/fdsnws/station/1/query ND * * * 2017-01-01T00:00:00 2017-01-01T00:10:00 """.strip() # This should return a dictionary that contains the root URL of each @@ -67,7 +67,7 @@ def test_response_splitting(self): "NA * * * 2017-01-01T00:00:00 2017-01-01T00:10:00"), "http://webservices.ingv.it": ( "NI * * * 2017-01-01T00:00:00 2017-01-01T00:10:00"), - "http://ws.resif.fr": ( + "https://ws.resif.fr": ( "ND * * * 2017-01-01T00:00:00 2017-01-01T00:10:00")}) data = """