Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

More f-strings

Browse source
This commit is contained in:
Hugo van Kemenade 2022-01-24 23:27:58 +02:00
parent 5f8d150652
commit b373de6c68
1 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/pylast/__init__.py
View file

@ -216,7 +216,7 @@ class _Network:
self.session_key = sk_gen.get_session_key(self.username, self.password_hash) self.session_key = sk_gen.get_session_key(self.username, self.password_hash)
def __str__(self): def __str__(self):
return "%s Network" % self.name return f"{self.name} Network"
def get_artist(self, artist_name): def get_artist(self, artist_name):
""" """
@ -276,9 +276,7 @@ class _Network:
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 "https://{}/{}".format( return f"https://{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):
""" """
@ -601,8 +599,8 @@ class _Network:
params = {} params = {}
for i in range(len(tracks_to_scrobble)): for i in range(len(tracks_to_scrobble)):
params["artist[%d]" % i] = tracks_to_scrobble[i]["artist"] params[f"artist[{i}]"] = tracks_to_scrobble[i]["artist"]
params["track[%d]" % i] = tracks_to_scrobble[i]["title"] params[f"track[{i}]"] = tracks_to_scrobble[i]["title"]
additional_args = ( additional_args = (
"timestamp", "timestamp",
@ -628,7 +626,7 @@ class _Network:
else: else:
maps_to = arg maps_to = arg
params["%s[%d]" % (maps_to, i)] = tracks_to_scrobble[i][arg] params[f"{maps_to}[{i}]"] = tracks_to_scrobble[i][arg]
_Request(self, "track.scrobble", params).execute() _Request(self, "track.scrobble", params).execute()
@ -702,16 +700,14 @@ class LastFMNetwork(_Network):
) )
def __repr__(self): def __repr__(self):
return "pylast.LastFMNetwork(%s)" % ( return (
", ".join( "pylast.LastFMNetwork("
( f"'{self.api_key}', "
"'%s'" % self.api_key, f"'{self.api_secret}', "
"'%s'" % self.api_secret, f"'{self.session_key}', "
"'%s'" % self.session_key, f"'{self.username}', "
"'%s'" % self.username, f"'{self.password_hash}'"
"'%s'" % self.password_hash, ")"
)
)
) )
@ -768,16 +764,14 @@ class LibreFMNetwork(_Network):
) )
def __repr__(self): def __repr__(self):
return "pylast.LibreFMNetwork(%s)" % ( return (
", ".join( "pylast.LibreFMNetwork("
( f"'{self.api_key}', "
"'%s'" % self.api_key, f"'{self.api_secret}', "
"'%s'" % self.api_secret, f"'{self.session_key}', "
"'%s'" % self.session_key, f"'{self.username}', "
"'%s'" % self.username, f"'{self.password_hash}'"
"'%s'" % self.password_hash, ")"
)
)
) )
@ -1018,8 +1012,10 @@ class SessionKeyGenerator:
token = self._get_web_auth_token() token = self._get_web_auth_token()
url = "{homepage}/api/auth/?api_key={api}&token={token}".format( url = (
homepage=self.network.homepage, api=self.network.api_key, token=token f"{self.network.homepage}/api/auth/"
f"?api_key={self.network.api_key}"
f"&token={token}"
) )
self.web_auth_tokens[url] = token self.web_auth_tokens[url] = token
@ -1443,8 +1439,9 @@ class MalformedResponseError(PyLastError):
self.underlying_error = underlying_error self.underlying_error = underlying_error
def __str__(self): def __str__(self):
return "Malformed response from {}. Underlying error: {}".format( return (
self.network.name, str(self.underlying_error) f"Malformed response from {self.network.name}. "
f"Underlying error: {self.underlying_error}"
) )
@ -1456,7 +1453,7 @@ class NetworkError(PyLastError):
self.underlying_error = underlying_error self.underlying_error = underlying_error
def __str__(self): def __str__(self):
return "NetworkError: %s" % str(self.underlying_error) return f"NetworkError: {self.underlying_error}"
class _Opus(_Taggable): class _Opus(_Taggable):
@ -1494,16 +1491,14 @@ class _Opus(_Taggable):
self.info = info self.info = info
def __repr__(self): def __repr__(self):
return "pylast.{}({}, {}, {})".format( return (
self.ws_prefix.title(), f"pylast.{self.ws_prefix.title()}"
repr(self.artist.name), f"({repr(self.artist.name)}, {repr(self.title)}, {repr(self.network)})"
repr(self.title),
repr(self.network),
) )
@_string_output @_string_output
def __str__(self): def __str__(self):
return _unicode("%s - %s") % (self.get_artist().get_name(), self.get_title()) return f"{self.get_artist().get_name()} - {self.get_title()}"
def __eq__(self, other): def __eq__(self, other):
if type(self) != type(other): if type(self) != type(other):
@ -2881,7 +2876,7 @@ def _number(string):
def _unescape_htmlentity(string): def _unescape_htmlentity(string):
mapping = html.entities.name2codepoint mapping = html.entities.name2codepoint
for key in mapping: for key in mapping:
string = string.replace("&%s;" % key, chr(mapping[key])) string = string.replace(f"&{key};", chr(mapping[key]))
return string return string