diff --git a/api/config/schema.py b/api/config/schema.py index aea23f3fe..99e4555fa 100644 --- a/api/config/schema.py +++ b/api/config/schema.py @@ -46,7 +46,7 @@ def custom_preprocessing_hook(endpoints): # your modifications to the list of operations that are exposed in the schema api_type = os.environ.get("API_TYPE", "v1") - for (path, path_regex, method, callback) in endpoints: + for path, path_regex, method, callback in endpoints: if path.startswith("/api/v1/providers"): continue diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 518f85bf8..95fc42ab1 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -736,7 +736,6 @@ See :doc:`/administrator_documentation/configuration_docs/ldap` for more informa """ if AUTH_LDAP_ENABLED: - # Import the LDAP modules here. # This way, we don't need the dependency unless someone # actually enables the LDAP support diff --git a/api/funkwhale_api/activity/views.py b/api/funkwhale_api/activity/views.py index 387a5f64d..4938301a5 100644 --- a/api/funkwhale_api/activity/views.py +++ b/api/funkwhale_api/activity/views.py @@ -9,7 +9,6 @@ from . import serializers, utils class ActivityViewSet(viewsets.GenericViewSet): - serializer_class = serializers.AutoSerializer permission_classes = [ConditionalAuthentication] queryset = TrackFavorite.objects.none() diff --git a/api/funkwhale_api/audio/renderers.py b/api/funkwhale_api/audio/renderers.py index 34812765c..79294ca3d 100644 --- a/api/funkwhale_api/audio/renderers.py +++ b/api/funkwhale_api/audio/renderers.py @@ -26,7 +26,6 @@ class PodcastRSSRenderer(renderers.JSONRenderer): class PodcastRSSContentNegociation(negotiation.DefaultContentNegotiation): def select_renderer(self, request, renderers, format_suffix=None): - return (PodcastRSSRenderer(), PodcastRSSRenderer.media_type) diff --git a/api/funkwhale_api/common/fields.py b/api/funkwhale_api/common/fields.py index 377c0663f..6217f66b0 100644 --- a/api/funkwhale_api/common/fields.py +++ b/api/funkwhale_api/common/fields.py @@ -57,7 +57,7 @@ class SmartSearchFilter(django_filters.CharFilter): return qs try: cleaned = self.config.clean(value) - except (forms.ValidationError): + except forms.ValidationError: return qs.none() return search.apply(qs, cleaned) diff --git a/api/funkwhale_api/common/filters.py b/api/funkwhale_api/common/filters.py index 1530954ac..6fb4b1b45 100644 --- a/api/funkwhale_api/common/filters.py +++ b/api/funkwhale_api/common/filters.py @@ -119,7 +119,6 @@ class MultipleQueryFilter(filters.TypedMultipleChoiceFilter): def filter_target(value): - config = { "artist": ["artist", "target_id", int], "album": ["album", "target_id", int], @@ -177,7 +176,6 @@ class ActorScopeFilter(filters.CharFilter): super().__init__(*args, **kwargs) def filter(self, queryset, value): - if not value: return queryset diff --git a/api/funkwhale_api/common/management/commands/load_test_data.py b/api/funkwhale_api/common/management/commands/load_test_data.py index 8209bb85f..f9997a331 100644 --- a/api/funkwhale_api/common/management/commands/load_test_data.py +++ b/api/funkwhale_api/common/management/commands/load_test_data.py @@ -46,7 +46,6 @@ def create_local_accounts(factories, count, dependencies): def create_taggable_items(dependency): def inner(factories, count, dependencies): - objs = [] tagged_objects = dependencies.get( dependency, list(CONFIG_BY_ID[dependency]["model"].objects.all().only("pk")) @@ -260,7 +259,6 @@ class Command(BaseCommand): self.stdout.write("") if options["dry_run"]: - self.stdout.write( "Run this command with --no-dry-run to commit the changes to the database" ) diff --git a/api/funkwhale_api/common/middleware.py b/api/funkwhale_api/common/middleware.py index 5736b973a..b83beb2e6 100644 --- a/api/funkwhale_api/common/middleware.py +++ b/api/funkwhale_api/common/middleware.py @@ -167,7 +167,6 @@ def render_tags(tags): """ for tag in tags: - yield "<{tag} {attrs} />".format( tag=tag.pop("tag"), attrs=" ".join( @@ -408,7 +407,6 @@ class PymallocMiddleware: self.get_response = get_response def __call__(self, request): - if tracemalloc.is_tracing(): snapshot = tracemalloc.take_snapshot() stats = snapshot.statistics("lineno") diff --git a/api/funkwhale_api/contrib/listenbrainz/client.py b/api/funkwhale_api/contrib/listenbrainz/client.py index b2d1f169b..70db31dc3 100644 --- a/api/funkwhale_api/contrib/listenbrainz/client.py +++ b/api/funkwhale_api/contrib/listenbrainz/client.py @@ -155,7 +155,7 @@ class ListenBrainzClient: def _get_payload_many(tracks): payload = [] - for (listened_at, track) in tracks: + for listened_at, track in tracks: data = _get_payload(track, listened_at) payload.append(data) return payload diff --git a/api/funkwhale_api/favorites/views.py b/api/funkwhale_api/favorites/views.py index c61251ac0..6a87d3b15 100644 --- a/api/funkwhale_api/favorites/views.py +++ b/api/funkwhale_api/favorites/views.py @@ -19,7 +19,6 @@ class TrackFavoriteViewSet( mixins.ListModelMixin, viewsets.GenericViewSet, ): - filterset_class = filters.TrackFavoriteFilter serializer_class = serializers.UserTrackFavoriteSerializer queryset = models.TrackFavorite.objects.all().select_related( diff --git a/api/funkwhale_api/federation/activity.py b/api/funkwhale_api/federation/activity.py index e76c82a5d..dedea8dd8 100644 --- a/api/funkwhale_api/federation/activity.py +++ b/api/funkwhale_api/federation/activity.py @@ -180,7 +180,6 @@ def receive(activity, on_behalf_of, inbox_actor=None): inbox_items = [] for recipients, type in [(local_to_recipients, "to"), (local_cc_recipients, "cc")]: - for r in recipients: inbox_items.append(models.InboxItem(actor_id=r, type=type, activity=copy)) diff --git a/api/funkwhale_api/federation/api_views.py b/api/funkwhale_api/federation/api_views.py index 201d9983a..e9d7bff01 100644 --- a/api/funkwhale_api/federation/api_views.py +++ b/api/funkwhale_api/federation/api_views.py @@ -208,7 +208,6 @@ class InboxItemViewSet( mixins.RetrieveModelMixin, viewsets.GenericViewSet, ): - queryset = ( models.InboxItem.objects.select_related("activity__actor") .prefetch_related("activity__object", "activity__target") @@ -239,7 +238,6 @@ class InboxItemViewSet( class FetchViewSet( mixins.CreateModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet ): - queryset = models.Fetch.objects.select_related("actor") serializer_class = api_serializers.FetchSerializer permission_classes = [permissions.IsAuthenticated] diff --git a/api/funkwhale_api/federation/jsonld.py b/api/funkwhale_api/federation/jsonld.py index 8f1f362cc..101b7fb92 100644 --- a/api/funkwhale_api/federation/jsonld.py +++ b/api/funkwhale_api/federation/jsonld.py @@ -154,7 +154,6 @@ def dereference(value, references): def get_value(value, keep=None, attr=None): - if keep == "first": value = value[0] if attr: @@ -253,7 +252,6 @@ class JsonLdSerializer(serializers.Serializer): def run_validation(self, data=empty): if data and data is not empty: - self.jsonld_context = data.get("@context", []) if self.context.get("expand", self.jsonld_expand): try: diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py index 31858f76d..c96cd8f38 100644 --- a/api/funkwhale_api/federation/serializers.py +++ b/api/funkwhale_api/federation/serializers.py @@ -756,7 +756,6 @@ class FollowActionSerializer(serializers.Serializer): class AcceptFollowSerializer(FollowActionSerializer): - type = serializers.ChoiceField(choices=["Accept"]) action_type = "accept" @@ -770,7 +769,6 @@ class AcceptFollowSerializer(FollowActionSerializer): class RejectFollowSerializer(FollowActionSerializer): - type = serializers.ChoiceField(choices=["Reject"]) action_type = "reject" diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py index d46cd721c..7d9abf634 100644 --- a/api/funkwhale_api/federation/tasks.py +++ b/api/funkwhale_api/federation/tasks.py @@ -139,7 +139,6 @@ def dispatch_outbox(activity): "delivery", ) def deliver_to_remote(delivery): - if not preferences.get("federation__enabled"): # federation is disabled, we only deliver to local recipients return diff --git a/api/funkwhale_api/federation/utils.py b/api/funkwhale_api/federation/utils.py index ee4d3834d..cd24dcb68 100644 --- a/api/funkwhale_api/federation/utils.py +++ b/api/funkwhale_api/federation/utils.py @@ -145,7 +145,6 @@ def is_local(url) -> bool: def get_actor_data_from_username(username): - parts = username.split("@") return { @@ -243,7 +242,6 @@ FID_MODEL_LABELS = [ def get_object_by_fid(fid, local=None): - if local: parsed = urllib.parse.urlparse(fid) if parsed.netloc != settings.FEDERATION_HOSTNAME: diff --git a/api/funkwhale_api/history/views.py b/api/funkwhale_api/history/views.py index 0012af790..812ed38ae 100644 --- a/api/funkwhale_api/history/views.py +++ b/api/funkwhale_api/history/views.py @@ -17,7 +17,6 @@ class ListeningViewSet( mixins.RetrieveModelMixin, viewsets.GenericViewSet, ): - serializer_class = serializers.ListeningSerializer queryset = models.Listening.objects.all().select_related( "user__actor__attachment_icon" diff --git a/api/funkwhale_api/manage/serializers.py b/api/funkwhale_api/manage/serializers.py index b96921e33..e097fc88f 100644 --- a/api/funkwhale_api/manage/serializers.py +++ b/api/funkwhale_api/manage/serializers.py @@ -395,7 +395,6 @@ class ManageNestedTrackSerializer(serializers.ModelSerializer): class ManageNestedAlbumSerializer(ManageBaseAlbumSerializer): - tracks_count = serializers.SerializerMethodField() class Meta: @@ -662,7 +661,6 @@ class ManageUploadSerializer(serializers.ModelSerializer): class ManageTagSerializer(ManageBaseAlbumSerializer): - tracks_count = serializers.SerializerMethodField() albums_count = serializers.SerializerMethodField() artists_count = serializers.SerializerMethodField() diff --git a/api/funkwhale_api/manage/views.py b/api/funkwhale_api/manage/views.py index 00c537f89..4de9b5e96 100644 --- a/api/funkwhale_api/manage/views.py +++ b/api/funkwhale_api/manage/views.py @@ -674,7 +674,6 @@ class ManageChannelViewSet( mixins.DestroyModelMixin, viewsets.GenericViewSet, ): - url_lookups = [ { "lookup_field": "uuid", diff --git a/api/funkwhale_api/moderation/mrf_policies.py b/api/funkwhale_api/moderation/mrf_policies.py index d6862b9e7..264baed37 100644 --- a/api/funkwhale_api/moderation/mrf_policies.py +++ b/api/funkwhale_api/moderation/mrf_policies.py @@ -36,7 +36,6 @@ def check_allow_list(payload, **kwargs): } if relevant_domains - allowed_domains: - raise mrf.Discard( "These domains are not allowed: {}".format( ", ".join(relevant_domains - allowed_domains) diff --git a/api/funkwhale_api/music/filters.py b/api/funkwhale_api/music/filters.py index 658dce608..0fc18bd8a 100644 --- a/api/funkwhale_api/music/filters.py +++ b/api/funkwhale_api/music/filters.py @@ -46,7 +46,6 @@ class RelatedFilterSet(filters.FilterSet): class ChannelFilterSet(filters.FilterSet): - channel = filters.CharFilter(field_name="_", method="filter_channel") def filter_channel(self, queryset, name, value): @@ -70,7 +69,6 @@ class ChannelFilterSet(filters.FilterSet): class LibraryFilterSet(filters.FilterSet): - library = filters.CharFilter(field_name="_", method="filter_library") def filter_library(self, queryset, name, value): @@ -96,7 +94,6 @@ class ArtistFilter( audio_filters.IncludeChannelsFilterSet, moderation_filters.HiddenContentFilterSet, ): - q = fields.SearchFilter(search_fields=["name"], fts_search_fields=["body_text"]) playable = filters.BooleanFilter(field_name="_", method="filter_playable") has_albums = filters.BooleanFilter(field_name="_", method="filter_has_albums") diff --git a/api/funkwhale_api/music/management/commands/import_files.py b/api/funkwhale_api/music/management/commands/import_files.py index d60e13c86..08c02138b 100644 --- a/api/funkwhale_api/music/management/commands/import_files.py +++ b/api/funkwhale_api/music/management/commands/import_files.py @@ -810,7 +810,6 @@ def check_updates(stdout, library, extensions, paths, batch_size): ) for upload in rows: - check_upload(stdout, upload) checked_paths.add(upload.source.replace("file://", "", 1)) diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py index 4e909fe8a..479e210e0 100644 --- a/api/funkwhale_api/music/metadata.py +++ b/api/funkwhale_api/music/metadata.py @@ -136,7 +136,6 @@ def clean_flac_pictures(apic): def clean_ogg_pictures(metadata_block_picture): pictures = [] for b64_data in [metadata_block_picture]: - try: data = base64.b64decode(b64_data) except (TypeError, ValueError): diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py index 9e4b81a15..fca044a16 100644 --- a/api/funkwhale_api/music/models.py +++ b/api/funkwhale_api/music/models.py @@ -437,7 +437,6 @@ class TrackQuerySet(common_models.LocalFromFidQuerySet, models.QuerySet): ) def annotate_playable_by_actor(self, actor): - files = ( Upload.objects.playable_by(actor) .filter(track=models.OuterRef("id")) @@ -448,7 +447,6 @@ class TrackQuerySet(common_models.LocalFromFidQuerySet, models.QuerySet): return self.annotate(is_playable_by_actor=subquery) def playable_by(self, actor, include=True): - if settings.MUSIC_USE_DENORMALIZATION: if actor is not None: query = models.Q(actor=None) | models.Q(actor=actor) diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py index 705c98e3d..2d4e173d7 100644 --- a/api/funkwhale_api/music/tasks.py +++ b/api/funkwhale_api/music/tasks.py @@ -445,7 +445,6 @@ def get_best_candidate_or_create(model, query, defaults, sort_fields): """ candidates = model.objects.filter(query) if candidates: - return sort_candidates(candidates, sort_fields)[0], False return model.objects.create(**defaults), True diff --git a/api/funkwhale_api/playlists/views.py b/api/funkwhale_api/playlists/views.py index ddcd0cea1..0b57a6ef9 100644 --- a/api/funkwhale_api/playlists/views.py +++ b/api/funkwhale_api/playlists/views.py @@ -20,7 +20,6 @@ class PlaylistViewSet( mixins.ListModelMixin, viewsets.GenericViewSet, ): - serializer_class = serializers.PlaylistSerializer queryset = ( models.Playlist.objects.all() diff --git a/api/funkwhale_api/radios/serializers.py b/api/funkwhale_api/radios/serializers.py index dc5d6c908..76e847d9e 100644 --- a/api/funkwhale_api/radios/serializers.py +++ b/api/funkwhale_api/radios/serializers.py @@ -54,7 +54,6 @@ class RadioSessionTrackSerializer(serializers.ModelSerializer): class RadioSessionSerializer(serializers.ModelSerializer): - related_object_id = serializers.CharField(required=False, allow_null=True) class Meta: diff --git a/api/funkwhale_api/radios/views.py b/api/funkwhale_api/radios/views.py index a81a1c218..adf2fe464 100644 --- a/api/funkwhale_api/radios/views.py +++ b/api/funkwhale_api/radios/views.py @@ -20,7 +20,6 @@ class RadioViewSet( mixins.DestroyModelMixin, viewsets.GenericViewSet, ): - serializer_class = serializers.RadioSerializer permission_classes = [ oauth_permissions.ScopePermission, @@ -87,7 +86,6 @@ class RadioViewSet( class RadioSessionViewSet( mixins.CreateModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet ): - serializer_class = serializers.RadioSessionSerializer queryset = models.RadioSession.objects.all() permission_classes = [] diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py index 6674a5e7c..316cce706 100644 --- a/api/funkwhale_api/subsonic/views.py +++ b/api/funkwhale_api/subsonic/views.py @@ -387,7 +387,6 @@ class SubsonicViewSet(viewsets.GenericViewSet): try: offset = int(data.get("offset", 0)) except (TypeError, ValueError): - offset = 0 try: diff --git a/api/funkwhale_api/users/admin.py b/api/funkwhale_api/users/admin.py index b63cf6b59..b5c3bde36 100644 --- a/api/funkwhale_api/users/admin.py +++ b/api/funkwhale_api/users/admin.py @@ -14,7 +14,6 @@ class MyUserChangeForm(UserChangeForm): class MyUserCreationForm(UserCreationForm): - error_message = UserCreationForm.error_messages.update( {"duplicate_username": "This username has already been taken."} ) diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py index 8c233188d..ad9523c45 100644 --- a/api/funkwhale_api/users/models.py +++ b/api/funkwhale_api/users/models.py @@ -114,7 +114,6 @@ class UserManager(BaseUserManager): class User(AbstractUser): - # First Name and Last Name do not cover name patterns # around the globe. name = models.CharField(_("Name of User"), blank=True, max_length=255) diff --git a/api/funkwhale_api/users/oauth/permissions.py b/api/funkwhale_api/users/oauth/permissions.py index 49d4af892..1bae9a1f0 100644 --- a/api/funkwhale_api/users/oauth/permissions.py +++ b/api/funkwhale_api/users/oauth/permissions.py @@ -47,7 +47,6 @@ METHOD_SCOPE_MAPPING = { class ScopePermission(permissions.BasePermission): def has_permission(self, request, view): - if request.method.lower() in ["options", "head"]: return True @@ -103,7 +102,6 @@ class ScopePermission(permissions.BasePermission): ) def has_permission_token(self, token, required_scope): - if token.is_expired(): return False diff --git a/api/funkwhale_api/users/serializers.py b/api/funkwhale_api/users/serializers.py index 8fe904f54..67908f6b9 100644 --- a/api/funkwhale_api/users/serializers.py +++ b/api/funkwhale_api/users/serializers.py @@ -185,7 +185,6 @@ class UserWriteSerializer(serializers.ModelSerializer): class UserReadSerializer(serializers.ModelSerializer): - permissions = serializers.SerializerMethodField() full_username = serializers.SerializerMethodField() avatar = common_serializers.AttachmentSerializer(source="get_avatar") diff --git a/api/tests/audio/test_views.py b/api/tests/audio/test_views.py index 1efd80eb8..1a1e46d65 100644 --- a/api/tests/audio/test_views.py +++ b/api/tests/audio/test_views.py @@ -138,7 +138,6 @@ def test_channel_update_permission(logged_in_api_client, factories): def test_channel_delete(logged_in_api_client, factories, mocker): - actor = logged_in_api_client.user.create_actor() channel = factories["audio.Channel"](attributed_to=actor) @@ -336,7 +335,6 @@ def test_channel_rss_feed_authentication_required(factories, api_client, prefere def test_channel_metadata_choices(factories, api_client): - expected = { "language": [ {"value": code, "label": name} for code, name in locales.ISO_639_CHOICES diff --git a/api/tests/federation/test_activity.py b/api/tests/federation/test_activity.py index 996843688..2a54a1494 100644 --- a/api/tests/federation/test_activity.py +++ b/api/tests/federation/test_activity.py @@ -16,7 +16,6 @@ from funkwhale_api.federation import ( def test_receive_validates_basic_attributes_and_stores_activity( mrf_inbox_registry, factories, now, mocker ): - mocker.patch.object( activity.InboxRouter, "get_matching_handlers", return_value=True ) @@ -598,7 +597,6 @@ def test_prepare_deliveries_and_inbox_items_allow_list(factories, preferences): def test_prepare_deliveries_and_inbox_items_instances_with_followers(factories): - domain1 = factories["federation.Domain"](with_service_actor=True) domain2 = factories["federation.Domain"](with_service_actor=True) library = factories["music.Library"](actor__local=True) diff --git a/api/tests/federation/test_jsonld.py b/api/tests/federation/test_jsonld.py index 0d13597fd..0419b7648 100644 --- a/api/tests/federation/test_jsonld.py +++ b/api/tests/federation/test_jsonld.py @@ -237,7 +237,6 @@ async def test_fetch_many(a_responses): def test_dereference(): - followers_doc = { "@context": jsonld.get_default_context(), "id": "https://noop/federation/actors/demo/followers", diff --git a/api/tests/federation/test_routes.py b/api/tests/federation/test_routes.py index 6cf8f12cd..ae77f364e 100644 --- a/api/tests/federation/test_routes.py +++ b/api/tests/federation/test_routes.py @@ -401,7 +401,6 @@ def test_inbox_delete_library(factories): def test_inbox_delete_album(factories): - album = factories["music.Album"](attributed=True) payload = { "type": "Delete", diff --git a/api/tests/federation/test_third_party_activitypub.py b/api/tests/federation/test_third_party_activitypub.py index 8841aac96..faa929e00 100644 --- a/api/tests/federation/test_third_party_activitypub.py +++ b/api/tests/federation/test_third_party_activitypub.py @@ -4,7 +4,6 @@ from funkwhale_api.federation import routes, serializers def test_pleroma_actor_from_ap_with_tags(factories): - payload = { "@context": [ "https://www.w3.org/ns/activitystreams", @@ -73,7 +72,6 @@ def test_pleroma_actor_from_ap_with_tags(factories): def test_pleroma_actor_from_ap(factories): - payload = { "@context": [ "https://www.w3.org/ns/activitystreams", diff --git a/api/tests/music/test_models.py b/api/tests/music/test_models.py index 253eca2e7..28af9182f 100644 --- a/api/tests/music/test_models.py +++ b/api/tests/music/test_models.py @@ -156,7 +156,6 @@ def test_import_track_with_different_artist_than_release(factories, mocker): "extension,mimetype", [("ogg", "audio/ogg"), ("mp3", "audio/mpeg")] ) def test_audio_track_mime_type(extension, mimetype, factories): - name = ".".join(["test", extension]) path = os.path.join(DATA_DIR, name) upload = factories["music.Upload"](audio_file__from_path=path, mimetype=None) @@ -166,7 +165,6 @@ def test_audio_track_mime_type(extension, mimetype, factories): @pytest.mark.parametrize("name", ["test.ogg", "test.mp3"]) def test_audio_track_checksum(name, factories): - path = os.path.join(DATA_DIR, name) upload = factories["music.Upload"](audio_file__from_path=path, mimetype=None) diff --git a/api/tests/radios/test_api.py b/api/tests/radios/test_api.py index 3b41dbc7e..4654f012b 100644 --- a/api/tests/radios/test_api.py +++ b/api/tests/radios/test_api.py @@ -135,7 +135,6 @@ def test_clean_config_is_called_on_serializer_save(mocker, factories): @pytest.mark.parametrize("radio_type", ["random", "less-listened", "favorites"]) def test_create_radio_session(radio_type, logged_in_api_client): - url = reverse("api:v1:radios:sessions-list") response = logged_in_api_client.post(url, {"radio_type": radio_type}) diff --git a/api/tests/radios/test_filters.py b/api/tests/radios/test_filters.py index d63ef7940..a75d7b5a7 100644 --- a/api/tests/radios/test_filters.py +++ b/api/tests/radios/test_filters.py @@ -2,7 +2,6 @@ from funkwhale_api.radios import filters def test_clean_config_artist_name_sorting(factories): - artist3 = factories["music.Artist"](name="The Green Eyes") artist2 = factories["music.Artist"](name="The Green Eyed Machine") artist1 = factories["music.Artist"](name="The Green Seed") @@ -21,7 +20,6 @@ def test_clean_config_artist_name_sorting(factories): def test_clean_config_tag_name_sorting(factories): - tag3 = factories["tags.Tag"](name="Rock") tag2 = factories["tags.Tag"](name="Classic") tag1 = factories["tags.Tag"](name="Punk") diff --git a/api/tests/radios/test_radios.py b/api/tests/radios/test_radios.py index 46cd5e2b6..edef108f4 100644 --- a/api/tests/radios/test_radios.py +++ b/api/tests/radios/test_radios.py @@ -419,7 +419,7 @@ def test_can_start_custom_multiple_radio_from_api(api_client, factories): tracks = factories["music.Track"].create_batch(5) url = reverse("api:v1:radios:sessions-list") map_filters_to_type = {"tags": "names", "artists": "ids", "playlists": "names"} - for (key, value) in map_filters_to_type.items(): + for key, value in map_filters_to_type.items(): attr = value[:-1] track_filter_key = [getattr(a.artist, attr) for a in tracks] config = {"filters": [{"type": key, value: track_filter_key}]} diff --git a/api/tests/test_test_utils.py b/api/tests/test_test_utils.py index a17b21856..301be25d1 100644 --- a/api/tests/test_test_utils.py +++ b/api/tests/test_test_utils.py @@ -2,5 +2,4 @@ from . import utils as test_utils def test_to_api_date(now): - assert test_utils.to_api_date(now) == now.isoformat().split("+")[0] + "Z" diff --git a/api/tests/users/oauth/test_scopes.py b/api/tests/users/oauth/test_scopes.py index e55b78319..c0e7488ba 100644 --- a/api/tests/users/oauth/test_scopes.py +++ b/api/tests/users/oauth/test_scopes.py @@ -187,5 +187,4 @@ from funkwhale_api.users.oauth import scopes ], ) def test_get_scopes_from_user_permissions(user_perms, expected): - assert scopes.get_from_permissions(**user_perms) == expected diff --git a/docs/get-releases-json.py b/docs/get-releases-json.py index 773106051..a668dc104 100755 --- a/docs/get-releases-json.py +++ b/docs/get-releases-json.py @@ -7,7 +7,6 @@ from distutils.version import StrictVersion def get_versions(): - output = subprocess.check_output( ["git", "tag", "-l", "--format=%(creatordate:iso-strict)|%(refname:short)"] ) @@ -16,7 +15,7 @@ def get_versions(): for line in output.decode().splitlines(): try: date, tag = line.split("|") - except (ValueError): + except ValueError: continue if not date or not tag: diff --git a/front/scripts/fix-fomantic-css.py b/front/scripts/fix-fomantic-css.py index 9266931e8..8e3b6005a 100755 --- a/front/scripts/fix-fomantic-css.py +++ b/front/scripts/fix-fomantic-css.py @@ -267,7 +267,7 @@ REPLACEMENTS = { ("background", "var(--site-background)"), ("color", "var(--text-color)"), ], - ("::-webkit-selection", "::-moz-selection", "::selection",): [ + ("::-webkit-selection", "::-moz-selection", "::selection"): [ ("color", "var(--text-selection-color)"), ("background-color", "var(--text-selection-background)"), ], @@ -448,7 +448,7 @@ REPLACEMENTS = { ): [ ("color", "var(--input-focus-placeholder-color)"), ], - (".ui.form .field > label", ".ui.form .inline.fields .field > label",): [ + (".ui.form .field > label", ".ui.form .inline.fields .field > label"): [ ("color", "var(--form-label-color)"), ], }, @@ -779,7 +779,7 @@ REPLACEMENTS = { ".structured", "tablet stackable", ], - (".ui.table", ".ui.table > thead > tr > th",): [ + (".ui.table", ".ui.table > thead > tr > th"): [ ("color", "var(--text-color)"), ("background", "var(--table-background)"), ],