Merge pull request #399 from kingosticks/ruffage

Fix fuff complaints

src/mopidy_spotify/web.py

@@ -277,7 +277,7 @@ class ExpiryStrategy(StrEnum):
 
 
 class WebResponse(dict):
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         url,
         data,

tests/conftest.py

@@ -3,16 +3,17 @@
 import pytest
 from mopidy import backend as backend_api
 from mopidy import models
+
 from mopidy_spotify import backend, library, utils, web
 
 
-@pytest.fixture()
+@pytest.fixture
 def caplog(caplog):
     caplog.set_level(utils.TRACE)
     return caplog
 
 
-@pytest.fixture()
+@pytest.fixture
 def config(tmp_path):
     return {
         "core": {
@@ -38,14 +39,14 @@ def config(tmp_path):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_mock():
     patcher = mock.patch.object(backend, "web", spec=web)
     yield patcher.start()
     patcher.stop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_search_mock(web_album_mock_base, web_artist_mock, web_track_mock):
     return {
         "albums": {"items": [web_album_mock_base]},
@@ -54,7 +55,7 @@ def web_search_mock(web_album_mock_base, web_artist_mock, web_track_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_search_mock_large(web_album_mock, web_artist_mock, web_track_mock):
     return {
         "albums": {"items": [web_album_mock] * 10},
@@ -63,12 +64,12 @@ def web_search_mock_large(web_album_mock, web_artist_mock, web_track_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_artist_mock():
     return {"name": "ABBA", "uri": "spotify:artist:abba", "type": "artist"}
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_track_mock_base(web_artist_mock):
     return {
         "artists": [web_artist_mock],
@@ -83,7 +84,7 @@ def web_track_mock_base(web_artist_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_album_mock_base(web_artist_mock):
     return {
         "name": "DEF 456",
@@ -95,7 +96,7 @@ def web_album_mock_base(web_artist_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_album_mock(web_album_mock_base, web_track_mock_base):
     return {
         **web_album_mock_base,
@@ -104,7 +105,7 @@ def web_album_mock(web_album_mock_base, web_track_mock_base):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_album_mock_base2(web_artist_mock):
     return {
         "name": "XYZ 789",
@@ -116,7 +117,7 @@ def web_album_mock_base2(web_artist_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_album_mock2(web_album_mock_base2, web_track_mock_base):
     return {
         **web_album_mock_base2,
@@ -125,25 +126,25 @@ def web_album_mock2(web_album_mock_base2, web_track_mock_base):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_track_mock(web_track_mock_base, web_album_mock_base):
     return {
         **web_track_mock_base,
         "album": web_album_mock_base,
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_track_mock_link(web_track_mock):
     return web.WebLink.from_uri(web_track_mock["uri"])
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_album_mock_link(web_album_mock):
     return web.WebLink.from_uri(web_album_mock["uri"])
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_response_mock(web_track_mock):
     return web.WebResponse(
         "https://api.spotify.com/v1/tracks/abc",
@@ -153,13 +154,13 @@ def web_response_mock(web_track_mock):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_response_mock_etag(web_response_mock):
     web_response_mock._etag = '"1234"'
     return web_response_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_oauth_mock():
     return {
         "access_token": "NgCXRK...MzYjw",
@@ -169,7 +170,7 @@ def web_oauth_mock():
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_playlist_mock(web_track_mock):
     return {
         "owner": {"id": "alice"},
@@ -181,12 +182,12 @@ def web_playlist_mock(web_track_mock):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def mopidy_artist_mock():
     return models.Artist(name="ABBA", uri="spotify:artist:abba")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mopidy_album_mock(mopidy_artist_mock):
     return models.Album(
         artists=[mopidy_artist_mock],
@@ -196,15 +197,15 @@ def mopidy_album_mock(mopidy_artist_mock):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_client_mock():
     web_client_mock = mock.MagicMock(spec=web.SpotifyOAuthClient)
     web_client_mock.user_id = "alice"
     web_client_mock.get_user_playlists.return_value = []
     return web_client_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def backend_mock(config, web_client_mock):
     backend_mock = mock.Mock(spec=backend.SpotifyBackend)
     backend_mock._config = config
@@ -213,7 +214,7 @@ def backend_mock(config, web_client_mock):
     return backend_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def backend_listener_mock():
     patcher = mock.patch.object(
         backend_api, "BackendListener", spec=backend_api.BackendListener
@@ -222,6 +223,6 @@ def backend_listener_mock():
     patcher.stop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def provider(backend_mock):
     return library.SpotifyLibraryProvider(backend_mock)

tests/test_backend.py

@@ -1,9 +1,9 @@
 from unittest import mock, skip
 
 from mopidy import backend as backend_api
+
 from mopidy_spotify import backend, library, playlists
 from mopidy_spotify.backend import SpotifyPlaybackProvider
-
 from tests import ThreadJoiner
 
 

tests/test_browse.py

@@ -2,6 +2,7 @@
 
 import pytest
 from mopidy import models
+
 from mopidy_spotify.browse import BROWSE_DIR_URIS
 
 

tests/test_distinct.py

@@ -2,10 +2,11 @@
 
 import pytest
 from mopidy import models
+
 from mopidy_spotify import distinct, playlists, search
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_client_mock_with_playlists(
     web_client_mock,
     web_playlist_mock,
@@ -19,7 +20,7 @@ def web_client_mock_with_playlists(
     return web_client_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def search_mock(mopidy_album_mock, mopidy_artist_mock):
     patcher = mock.patch.object(distinct, "search", spec=search)
     search_mock = patcher.start()

tests/test_images.py

@@ -1,10 +1,11 @@
 import pytest
 from mopidy import models
+
 from mopidy_spotify import images
 from mopidy_spotify.web import LinkType, WebLink
 
 
-@pytest.fixture()
+@pytest.fixture
 def img_provider(provider):
     images._cache = {}
     return provider

tests/test_lookup.py

@@ -3,6 +3,7 @@
 
 import mopidy
 import pytest
+
 from mopidy_spotify import lookup
 
 

tests/test_playback.py

@@ -3,22 +3,23 @@
 import pytest
 from mopidy import audio
 from mopidy import backend as backend_api
+
 from mopidy_spotify import backend
 
 
-@pytest.fixture()
+@pytest.fixture
 def audio_mock():
     return mock.Mock(spec=audio.Audio)
 
 
-@pytest.fixture()
+@pytest.fixture
 def backend_mock(config):
     backend_mock = mock.Mock(spec=backend.SpotifyBackend)
     backend_mock._config = config
     return backend_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def provider(audio_mock, backend_mock):
     return backend.SpotifyPlaybackProvider(audio=audio_mock, backend=backend_mock)
 

tests/test_playlists.py

@@ -4,12 +4,12 @@
 import pytest
 from mopidy import backend as backend_api
 from mopidy.models import Ref
-from mopidy_spotify import playlists
 
+from mopidy_spotify import playlists
 from tests import ThreadJoiner
 
 
-@pytest.fixture()
+@pytest.fixture
 def web_client_mock(web_client_mock, web_track_mock):
     web_playlist1 = {
         "owner": {"id": "alice"},
@@ -42,7 +42,7 @@ def get_playlist(*args, **kwargs):
     return web_client_mock
 
 
-@pytest.fixture()
+@pytest.fixture
 def provider(backend_mock, web_client_mock):
     backend_mock._web_client = web_client_mock
     return playlists.SpotifyPlaylistsProvider(backend_mock)

tests/test_search.py

@@ -1,6 +1,7 @@
 from unittest import mock
 
 from mopidy import models
+
 from mopidy_spotify import lookup, search, translator
 
 

tests/test_translator.py

@@ -3,6 +3,7 @@
 
 import pytest
 from mopidy import models
+
 from mopidy_spotify import translator