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

Merge pull request #271 from pylast/pyupgrade

Browse source 
Run pyupgrade
This commit is contained in:
Hugo 2018-06-08 17:34:43 +03:00 committed by GitHub
parent cfaef14a94 d65e2bdb3e
commit 5c0785f7fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pylast/__init__.py
View file

@ -258,9 +258,8 @@ 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 "https://%s/%s" % ( return "https://{}/{}".format(
self._get_language_domain(domain), self._get_language_domain(domain), self.urls[url_type]
self.urls[url_type],
) )
def _get_ws_auth(self): def _get_ws_auth(self):
@ -1458,7 +1457,7 @@ class _Opus(_BaseObject, _Taggable):
self.info = info self.info = info
def __repr__(self): def __repr__(self):
return "pylast.%s(%s, %s, %s)" % ( return "pylast.{}({}, {}, {})".format(
self.ws_prefix.title(), self.ws_prefix.title(),
repr(self.artist.name), repr(self.artist.name),
repr(self.title), repr(self.title),
@ -1639,7 +1638,7 @@ class Artist(_BaseObject, _Taggable):
self.info = info self.info = info
def __repr__(self): def __repr__(self):
return "pylast.Artist(%s, %s)" % (repr(self.get_name()), repr(self.network)) return "pylast.Artist({}, {})".format(repr(self.get_name()), repr(self.network))
def __unicode__(self): def __unicode__(self):
return six.text_type(self.get_name()) return six.text_type(self.get_name())
@ -1840,7 +1839,7 @@ class Country(_BaseObject):
self.name = name self.name = name
def __repr__(self): def __repr__(self):
return "pylast.Country(%s, %s)" % (repr(self.name), repr(self.network)) return "pylast.Country({}, {})".format(repr(self.name), repr(self.network))
@_string_output @_string_output
def __str__(self): def __str__(self):
@ -1918,7 +1917,7 @@ class Library(_BaseObject):
self.user = User(user, self.network) self.user = User(user, self.network)
def __repr__(self): def __repr__(self):
return "pylast.Library(%s, %s)" % (repr(self.user), repr(self.network)) return "pylast.Library({}, {})".format(repr(self.user), repr(self.network))
@_string_output @_string_output
def __str__(self): def __str__(self):
@ -1965,7 +1964,7 @@ class Tag(_BaseObject, _Chartable):
self.name = name self.name = name
def __repr__(self): def __repr__(self):
return "pylast.Tag(%s, %s)" % (repr(self.name), repr(self.network)) return "pylast.Tag({}, {})".format(repr(self.name), repr(self.network))
@_string_output @_string_output
def __str__(self): def __str__(self):
@ -2174,7 +2173,7 @@ class User(_BaseObject, _Chartable):
self.name = user_name self.name = user_name
def __repr__(self): def __repr__(self):
return "pylast.User(%s, %s)" % (repr(self.name), repr(self.network)) return "pylast.User({}, {})".format(repr(self.name), repr(self.network))
@_string_output @_string_output
def __str__(self): def __str__(self):