Update links to HTTPS; update lang links

This commit is contained in:
Isaacs, Ben 2017-07-07 10:33:24 +01:00
parent 2156466f70
commit 7584679b72

View file

@ -343,7 +343,7 @@ class _Network(object):
""" """
Returns a Scrobbler object used for submitting tracks to the server Returns a Scrobbler object used for submitting tracks to the server
Quote from http://www.last.fm/api/submissions: Quote from https://www.last.fm/api/submissions:
======== ========
Client identifiers are used to provide a centrally managed database Client identifiers are used to provide a centrally managed database
of the client versions, allowing clients to be banned if they are of the client versions, allowing clients to be banned if they are
@ -382,7 +382,7 @@ class _Network(object):
return self.domain_names[domain_language] return self.domain_names[domain_language]
def _get_url(self, domain, url_type): def _get_url(self, domain, url_type):
return "http://%s/%s" % ( return "https://%s/%s" % (
self._get_language_domain(domain), self.urls[url_type]) self._get_language_domain(domain), self.urls[url_type])
def _get_ws_auth(self): def _get_ws_auth(self):
@ -396,7 +396,7 @@ class _Network(object):
Makes sure that web service calls are at least 0.2 seconds apart. Makes sure that web service calls are at least 0.2 seconds apart.
""" """
# Delay time in seconds from section 4.4 of http://www.last.fm/api/tos # Delay time in seconds from section 4.4 of https://www.last.fm/api/tos
DELAY_TIME = 0.2 DELAY_TIME = 0.2
now = time.time() now = time.time()
@ -890,7 +890,7 @@ class LastFMNetwork(_Network):
Most read-only webservices only require an api_key and an api_secret, see Most read-only webservices only require an api_key and an api_secret, see
about obtaining them from: about obtaining them from:
http://www.last.fm/api/account https://www.last.fm/api/account
""" """
def __init__( def __init__(
@ -899,7 +899,7 @@ class LastFMNetwork(_Network):
_Network.__init__( _Network.__init__(
self, self,
name="Last.fm", name="Last.fm",
homepage="http://last.fm", homepage="https://www.last.fm",
ws_server=("ws.audioscrobbler.com", "/2.0/"), ws_server=("ws.audioscrobbler.com", "/2.0/"),
api_key=api_key, api_key=api_key,
api_secret=api_secret, api_secret=api_secret,
@ -910,17 +910,17 @@ class LastFMNetwork(_Network):
token=token, token=token,
domain_names={ domain_names={
DOMAIN_ENGLISH: 'www.last.fm', DOMAIN_ENGLISH: 'www.last.fm',
DOMAIN_GERMAN: 'www.lastfm.de', DOMAIN_GERMAN: 'www.last.fm/de',
DOMAIN_SPANISH: 'www.lastfm.es', DOMAIN_SPANISH: 'www.last.fm/es',
DOMAIN_FRENCH: 'www.lastfm.fr', DOMAIN_FRENCH: 'www.last.fm/fr',
DOMAIN_ITALIAN: 'www.lastfm.it', DOMAIN_ITALIAN: 'www.last.fm/it',
DOMAIN_POLISH: 'www.lastfm.pl', DOMAIN_POLISH: 'www.last.fm/pl',
DOMAIN_PORTUGUESE: 'www.lastfm.com.br', DOMAIN_PORTUGUESE: 'www.last.fm/pt',
DOMAIN_SWEDISH: 'www.lastfm.se', DOMAIN_SWEDISH: 'www.last.fm/sv',
DOMAIN_TURKISH: 'www.lastfm.com.tr', DOMAIN_TURKISH: 'www.last.fm/tr',
DOMAIN_RUSSIAN: 'www.lastfm.ru', DOMAIN_RUSSIAN: 'www.last.fm/ru',
DOMAIN_JAPANESE: 'www.lastfm.jp', DOMAIN_JAPANESE: 'www.last.fm/ja',
DOMAIN_CHINESE: 'cn.last.fm', DOMAIN_CHINESE: 'www.last.fm/zh',
}, },
urls={ urls={
"album": "music/%(artist)s/%(album)s", "album": "music/%(artist)s/%(album)s",
@ -966,7 +966,7 @@ def get_lastfm_network(
Most read-only webservices only require an api_key and an api_secret, see Most read-only webservices only require an api_key and an api_secret, see
about obtaining them from: about obtaining them from:
http://www.last.fm/api/account https://www.last.fm/api/account
""" """
_deprecation_warning("Create a LastFMNetwork object instead") _deprecation_warning("Create a LastFMNetwork object instead")
@ -997,7 +997,7 @@ class LibreFMNetwork(_Network):
_Network.__init__( _Network.__init__(
self, self,
name="Libre.fm", name="Libre.fm",
homepage="http://libre.fm", homepage="https://libre.fm",
ws_server=("libre.fm", "/2.0/"), ws_server=("libre.fm", "/2.0/"),
api_key=api_key, api_key=api_key,
api_secret=api_secret, api_secret=api_secret,