refactor(api): remove unnecessary or wrong `is` keyword usage

api/funkwhale_api/audio/filters.py

@@ -54,7 +54,7 @@ class ChannelFilter(moderation_filters.HiddenContentFilterSet):
 
         query = Q(actor__in=emitted_follows.values_list("target", flat=True))
 
-        if value is True:
+        if value:
             return queryset.filter(query)
         else:
             return queryset.exclude(query)
@@ -64,9 +64,9 @@ class ChannelFilter(moderation_filters.HiddenContentFilterSet):
             attributed_to=actors.get_service_actor(),
             actor__preferred_username__startswith="rssfeed-",
         )
-        if value is True:
+        if value:
             queryset = queryset.filter(query)
-        if value is False:
+        else:
             queryset = queryset.exclude(query)
 
         return queryset

api/funkwhale_api/audio/views.py

@@ -102,7 +102,7 @@ class ChannelViewSet(
             return serializers.ChannelSerializer
         elif self.action in ["update", "partial_update"]:
             return serializers.ChannelUpdateSerializer
-        elif self.action is "create":
+        elif self.action == "create":
             return serializers.ChannelCreateSerializer
         return serializers.ChannelSerializer
 

api/funkwhale_api/common/models.py

@@ -187,7 +187,7 @@ class AttachmentQuerySet(models.QuerySet):
             field_query = ~models.Q(**{field: None})
             query = query | field_query if query else field_query
 
-        if include is False:
+        if not include:
             query = ~query
 
         return self.filter(query)

api/funkwhale_api/federation/utils.py

@@ -249,7 +249,7 @@ FID_MODEL_LABELS = [
 
 def get_object_by_fid(fid, local=None):
 
-    if local is True:
+    if local:
         parsed = urllib.parse.urlparse(fid)
         if parsed.netloc != settings.FEDERATION_HOSTNAME:
             raise ObjectDoesNotExist()

api/funkwhale_api/manage/views.py

@@ -537,7 +537,7 @@ class ManageReportViewSet(
 
     def perform_update(self, serializer):
         is_handled = serializer.instance.is_handled
-        if not is_handled and serializer.validated_data.get("is_handled") is True:
+        if not is_handled and serializer.validated_data.get("is_handled"):
             # report was resolved, we assign to the mod making the request
             serializer.save(assigned_to=self.request.user.actor)
         else:

api/funkwhale_api/moderation/filters.py

@@ -64,7 +64,7 @@ class HiddenContentFilterSet(filters.FilterSet):
         config = self.__class__.Meta.hidden_content_fields_mapping
         final_query = get_filtered_content_query(config, user)
 
-        if value is True:
+        if value:
             return queryset.filter(final_query)
         else:
             return queryset.exclude(final_query)

api/funkwhale_api/moderation/models.py

@@ -226,7 +226,7 @@ class UserRequest(models.Model):
 
 @receiver(pre_save, sender=Report)
 def set_handled_date(sender, instance, **kwargs):
-    if instance.is_handled is True and not instance.handled_date:
+    if instance.is_handled and not instance.handled_date:
         instance.handled_date = timezone.now()
     elif not instance.is_handled:
         instance.handled_date = None

api/funkwhale_api/music/filters.py

@@ -135,10 +135,7 @@ class ArtistFilter(
         return queryset.playable_by(actor, value).distinct()
 
     def filter_has_albums(self, queryset, name, value):
-        if value is True:
-            return queryset.filter(albums__isnull=False)
-        else:
-            return queryset.filter(albums__isnull=True)
+        return queryset.filter(albums__isnull=not value)
 
 
 class TrackFilter(

api/funkwhale_api/music/management/commands/import_files.py

@@ -355,7 +355,7 @@ class Command(BaseCommand):
         batch_duration = None
         self.stdout.write("Starting import of new files…")
         for i, entries in enumerate(batch(crawler, options["batch_size"])):
-            if options.get("update_cache", False) is True:
+            if options.get("update_cache", False):
                 # check to see if the scan was cancelled
                 if cache.get("fs-import:status") == "canceled":
                     raise CommandError("Import cancelled")

api/funkwhale_api/users/oauth/scopes.py

@@ -98,7 +98,7 @@ def get_from_permissions(**permissions):
 
     final = LOGGED_IN_SCOPES
     for permission_name, value in permissions.items():
-        if value is False:
+        if not value:
             continue
         config = models.PERMISSIONS_CONFIGURATION[permission_name]
         final = final | config["scopes"]

api/tests/test_import_audio_file.py

@@ -154,7 +154,7 @@ def test_import_files_in_place(factories, mocker, settings):
         interactive=False,
     )
     upload = library.uploads.last()
-    assert bool(upload.audio_file) is False
+    assert not upload.audio_file
     mocked_process.assert_called_once_with(upload_id=upload.pk)
 
 

changes/changelog.d/is.enhancement

@@ -0,0 +1 @@
+Remove unnecessary or wrong `is` keyword usage from backend