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

Merge pull request #370 from pylast/pre-commmit

Browse source
This commit is contained in:
Hugo van Kemenade 2021-08-02 21:44:01 +03:00 committed by GitHub
parent e193106bde a850f093f0
commit fd520ad47b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.pre-commit-config.yaml
View file

@ -1,12 +1,12 @@
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v2.10.0
rev: v2.23.1
hooks:
- id: pyupgrade
args: ["--py36-plus"]
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 21.7b0
hooks:
- id: black
args: ["--target-version", "py36"]
@ -15,35 +15,38 @@ repos:
types: []
- repo: https://github.com/asottile/blacken-docs
rev: v1.9.2
rev: v1.10.0
hooks:
- id: blacken-docs
args: ["--target-version", "py36"]
additional_dependencies: [black==20.8b1]
- repo: https://github.com/PyCQA/isort
rev: 5.7.0
rev: 5.9.3
hooks:
- id: isort
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
hooks:
- id: flake8
additional_dependencies: [flake8-2020, flake8-implicit-str-concat]
- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.7.1
rev: v1.9.0
hooks:
- id: python-check-blanket-noqa
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.0.1
hooks:
- id: check-merge-conflict
- id: check-yaml
- repo: https://github.com/tox-dev/tox-ini-fmt
rev: 0.5.0
rev: 0.5.1
hooks:
- id: tox-ini-fmt
ci:
autoupdate_schedule: quarterly

35
src/pylast/__init__.py
View file

@ -1355,7 +1355,7 @@ class _Taggable(_BaseObject):
self.remove_tag(tag)
def clear_tags(self):
"""Clears all the user-set tags. """
"""Clears all the user-set tags."""
self.remove_tags(*(self.get_tags()))
@ -1702,7 +1702,7 @@ class Artist(_Taggable):
self.info = info
def __repr__(self):
return "pylast.Artist({}, {})".format(repr(self.get_name()), repr(self.network))
return f"pylast.Artist({repr(self.get_name())}, {repr(self.network)})"
def __unicode__(self):
return str(self.get_name())
@ -1798,9 +1798,14 @@ class Artist(_Taggable):
else:
params = None
return self._extract_cdata_from_request(
self.ws_prefix + ".getInfo", section, params
)
try:
bio = self._extract_cdata_from_request(
self.ws_prefix + ".getInfo", section, params
)
except IndexError:
bio = None
return bio
def get_bio_published_date(self):
"""Returns the date on which the artist's biography was published."""
@ -1886,7 +1891,7 @@ class Country(_BaseObject):
self.name = name
def __repr__(self):
return "pylast.Country({}, {})".format(repr(self.name), repr(self.network))
return f"pylast.Country({repr(self.name)}, {repr(self.network)})"
@_string_output
def __str__(self):
@ -1902,7 +1907,7 @@ class Country(_BaseObject):
return {"country": self.get_name()}
def get_name(self):
"""Returns the country name. """
"""Returns the country name."""
return self.name
@ -1964,7 +1969,7 @@ class Library(_BaseObject):
self.user = User(user, self.network)
def __repr__(self):
return "pylast.Library({}, {})".format(repr(self.user), repr(self.network))
return f"pylast.Library({repr(self.user)}, {repr(self.network)})"
@_string_output
def __str__(self):
@ -2010,7 +2015,7 @@ class Tag(_Chartable):
self.name = name
def __repr__(self):
return "pylast.Tag({}, {})".format(repr(self.name), repr(self.network))
return f"pylast.Tag({repr(self.name)}, {repr(self.network)})"
@_string_output
def __str__(self):
@ -2026,7 +2031,7 @@ class Tag(_Chartable):
return {self.ws_prefix: self.get_name()}
def get_name(self, properly_capitalized=False):
"""Returns the name of the tag. """
"""Returns the name of the tag."""
if properly_capitalized:
self.name = _extract(
@ -2149,12 +2154,12 @@ class Track(_Opus):
return Album(_extract(node, "artist"), _extract(node, "title"), self.network)
def love(self):
"""Adds the track to the user's loved tracks. """
"""Adds the track to the user's loved tracks."""
self._request(self.ws_prefix + ".love")
def unlove(self):
"""Remove the track to the user's loved tracks. """
"""Remove the track to the user's loved tracks."""
self._request(self.ws_prefix + ".unlove")
@ -2220,7 +2225,7 @@ class User(_Chartable):
self.name = user_name
def __repr__(self):
return "pylast.User({}, {})".format(repr(self.name), repr(self.network))
return f"pylast.User({repr(self.name)}, {repr(self.network)})"
@_string_output
def __str__(self):
@ -2259,7 +2264,7 @@ class User(_Chartable):
return self.name
def get_friends(self, limit=50, cacheable=False, stream=False):
"""Returns a list of the user's friends. """
"""Returns a list of the user's friends."""
def _get_friends():
for node in _collect_nodes(
@ -2604,7 +2609,7 @@ class User(_Chartable):
return self.network._get_url(domain_name, "user") % {"name": name}
def get_library(self):
"""Returns the associated Library object. """
"""Returns the associated Library object."""
return Library(self, self.network)

2
tests/test_album.py
View file

@ -95,4 +95,4 @@ class TestPyLastAlbum(TestPyLastWithLastFm):
# Assert
self.assert_startswith(image, "https://")
self.assert_endswith(image, ".png")
self.assert_endswith(image, ".gif")

4
tests/test_network.py
View file

@ -265,8 +265,10 @@ class TestPyLastNetwork(TestPyLastWithLastFm):
# Assert
assert isinstance(artist, pylast.Artist)
assert artist.name == "MusicBrainz Test Artist"
assert artist.name in ("MusicBrainz Test Artist", "MusicBrainzz Test Artist")
@pytest.mark.xfail(reason="Broken at Last.fm: Track not found")
# https://support.last.fm/t/track-getinfo-with-mbid-returns-6-track-not-found/47905
def test_track_mbid(self):
# Arrange
mbid = "ebc037b1-cc9c-44f2-a21f-83c219f0e1e0"