From 77973ba6f95a605bd57ee2b55cc20db8db653ca8 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 21 Oct 2018 20:33:41 +0200
Subject: [PATCH] See #574: linting
---
api/funkwhale_api/music/models.py | 4 +++-
api/funkwhale_api/subsonic/views.py | 4 +++-
api/tests/subsonic/test_views.py | 6 ++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py
index 6d3c0dff..87f7ba81 100644
--- a/api/funkwhale_api/music/models.py
+++ b/api/funkwhale_api/music/models.py
@@ -557,7 +557,9 @@ class UploadQuerySet(models.QuerySet):
libraries = Library.objects.viewable_by(actor)
if include:
- return self.filter(library__in=libraries, import_status="finished").distinct()
+ return self.filter(
+ library__in=libraries, import_status="finished"
+ ).distinct()
return self.exclude(library__in=libraries, import_status="finished").distinct()
def local(self, include=True):
diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py
index 308ed491..da646fca 100644
--- a/api/funkwhale_api/subsonic/views.py
+++ b/api/funkwhale_api/subsonic/views.py
@@ -235,7 +235,9 @@ class SubsonicViewSet(viewsets.GenericViewSet):
except (TypeError, KeyError, ValueError):
size = 50
- queryset = queryset.playable_by(actor).prefetch_related('uploads').order_by("?")[:size]
+ queryset = (
+ queryset.playable_by(actor).prefetch_related("uploads").order_by("?")[:size]
+ )
data = {
"randomSongs": {
"song": serializers.GetSongSerializer(queryset, many=True).data
diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py
index 9e71fca9..8d84758d 100644
--- a/api/tests/subsonic/test_views.py
+++ b/api/tests/subsonic/test_views.py
@@ -254,13 +254,15 @@ def test_get_random_songs(f, db, logged_in_api_client, factories, mocker):
factories["music.Track"]()
order_by = mocker.patch.object(
- music_models.TrackQuerySet, 'order_by', return_value=[track1, track2]
+ music_models.TrackQuerySet, "order_by", return_value=[track1, track2]
)
response = logged_in_api_client.get(url, {"f": f, "size": 2})
assert response.status_code == 200
assert response.data == {
- "randomSongs": {"song": serializers.GetSongSerializer([track1, track2], many=True).data}
+ "randomSongs": {
+ "song": serializers.GetSongSerializer([track1, track2], many=True).data
+ }
}
order_by.assert_called_once_with("?")
--
GitLab