From ec8c18097d2ad16be125f60430097a5f1a32fc7e Mon Sep 17 00:00:00 2001 From: jo Date: Wed, 22 Jun 2022 13:27:10 +0200 Subject: [PATCH] chore(api): fix some linting errors --- .../legacy/management/commands/set_icecast_passwords.py | 1 - api/libretime_api/schedule/models/playlist.py | 2 +- api/libretime_api/schedule/tests/views/test_schedule.py | 4 ++-- api/libretime_api/storage/tests/views/test_file.py | 2 +- api/libretime_api/storage/views/file.py | 2 +- api/libretime_api/tests/test_permissions.py | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/libretime_api/legacy/management/commands/set_icecast_passwords.py b/api/libretime_api/legacy/management/commands/set_icecast_passwords.py index 750933a62..6b63c0e2d 100644 --- a/api/libretime_api/legacy/management/commands/set_icecast_passwords.py +++ b/api/libretime_api/legacy/management/commands/set_icecast_passwords.py @@ -1,4 +1,3 @@ -import os from pathlib import Path from typing import Optional, Tuple from xml.etree import ElementTree diff --git a/api/libretime_api/schedule/models/playlist.py b/api/libretime_api/schedule/models/playlist.py index 5b2fc8154..614e06e43 100644 --- a/api/libretime_api/schedule/models/playlist.py +++ b/api/libretime_api/schedule/models/playlist.py @@ -52,7 +52,7 @@ class PlaylistContent(models.Model): fadeout = models.TimeField(blank=True, null=True) def get_owner(self): - return self.playlist.owner + return self.playlist.get_owner() class Meta: managed = False diff --git a/api/libretime_api/schedule/tests/views/test_schedule.py b/api/libretime_api/schedule/tests/views/test_schedule.py index 0aa8efae3..57cc19fa4 100644 --- a/api/libretime_api/schedule/tests/views/test_schedule.py +++ b/api/libretime_api/schedule/tests/views/test_schedule.py @@ -99,7 +99,7 @@ class TestScheduleViewSet(APITestCase): instance=show, file=file, ) - invalid_schedule_item = baker.make( + invalid_schedule_item = baker.make( # pylint: disable=unused-variable "schedule.Schedule", starts=show.ends + timedelta(minutes=1), ends=show.ends + timedelta(minutes=1) + file.length, @@ -142,7 +142,7 @@ class TestScheduleViewSet(APITestCase): instance=show, file=file, ) - previous_item = baker.make( + previous_item = baker.make( # pylint: disable=unused-variable "schedule.Schedule", starts=filter_point - timedelta(minutes=5), ends=filter_point - timedelta(minutes=5) + file.length, diff --git a/api/libretime_api/storage/tests/views/test_file.py b/api/libretime_api/storage/tests/views/test_file.py index 07e51b806..832217d46 100644 --- a/api/libretime_api/storage/tests/views/test_file.py +++ b/api/libretime_api/storage/tests/views/test_file.py @@ -2,7 +2,7 @@ from django.conf import settings from model_bakery import baker from rest_framework.test import APITestCase -from ...._fixtures import AUDIO_FILENAME, fixture_path +from ...._fixtures import AUDIO_FILENAME class TestFileViewSet(APITestCase): diff --git a/api/libretime_api/storage/views/file.py b/api/libretime_api/storage/views/file.py index 7f09b68a2..fc04b5c24 100644 --- a/api/libretime_api/storage/views/file.py +++ b/api/libretime_api/storage/views/file.py @@ -17,7 +17,7 @@ class FileViewSet(viewsets.ModelViewSet): model_permission_name = "file" @action(detail=True, methods=["GET"]) - def download(self, request, pk=None): + def download(self, request, pk=None): # pylint: disable=invalid-name pk = IntegerField().to_internal_value(data=pk) file = get_object_or_404(File, pk=pk) diff --git a/api/libretime_api/tests/test_permissions.py b/api/libretime_api/tests/test_permissions.py index 4a4799ab7..f3a7a44bf 100644 --- a/api/libretime_api/tests/test_permissions.py +++ b/api/libretime_api/tests/test_permissions.py @@ -51,7 +51,7 @@ class TestPermissions(APITestCase): "webstreams", ] - def logged_in_test_model(self, model, role, username, fn): + def logged_in_test_model(self, model, role, username, function): path = self.path.format(model) if not get_user_model().objects.filter(username=username): get_user_model().objects.create_user( @@ -63,7 +63,7 @@ class TestPermissions(APITestCase): last_name="user", ) self.client.login(username=username, password="test") - return fn(path) + return function(path) @classmethod def setUpTestData(cls):