chore: format files using isort (pre-commit)

api/funkwhale_api/audio/factories.py

@@ -2,7 +2,7 @@ import uuid
 
 import factory
 
-from funkwhale_api.factories import registry, NoUpdateOnCreate
+from funkwhale_api.factories import NoUpdateOnCreate, registry
 from funkwhale_api.federation import actors
 from funkwhale_api.federation import factories as federation_factories
 from funkwhale_api.music import factories as music_factories

api/funkwhale_api/audio/filters.py

@@ -1,6 +1,5 @@
-from django.db.models import Q
-
 import django_filters
+from django.db.models import Q
 
 from funkwhale_api.common import fields
 from funkwhale_api.common import filters as common_filters

api/funkwhale_api/audio/models.py

@@ -1,14 +1,13 @@
 import uuid
 
-
 from django.contrib.contenttypes.fields import GenericRelation
-from django.db.models import JSONField
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
-from django.urls import reverse
-from django.utils import timezone
+from django.db.models import JSONField
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
+from django.urls import reverse
+from django.utils import timezone
 
 from funkwhale_api.federation import keys
 from funkwhale_api.federation import models as federation_models

api/funkwhale_api/audio/renderers.py

@@ -1,7 +1,6 @@
 import xml.etree.ElementTree as ET
 
-from rest_framework import negotiation
-from rest_framework import renderers
+from rest_framework import negotiation, renderers
 
 from funkwhale_api.subsonic.renderers import dict_to_xml_tree
 

api/funkwhale_api/audio/serializers.py

@@ -3,42 +3,35 @@ import logging
 import time
 import uuid
 
+import feedparser
+import pytz
+import requests
 from django.conf import settings
 from django.db import transaction
 from django.db.models import Q
-from django.utils import timezone
-
-import feedparser
-import requests
-import pytz
-
-from rest_framework import serializers
-
 from django.templatetags.static import static
 from django.urls import reverse
+from django.utils import timezone
+from drf_spectacular.types import OpenApiTypes
+from drf_spectacular.utils import extend_schema_field
+from rest_framework import serializers
 
+from funkwhale_api.common import locales, preferences
 from funkwhale_api.common import serializers as common_serializers
-from funkwhale_api.common import utils as common_utils
-from funkwhale_api.common import locales
-from funkwhale_api.common import preferences
 from funkwhale_api.common import session
+from funkwhale_api.common import utils as common_utils
 from funkwhale_api.federation import actors
 from funkwhale_api.federation import models as federation_models
 from funkwhale_api.federation import serializers as federation_serializers
 from funkwhale_api.federation import utils as federation_utils
 from funkwhale_api.moderation import mrf
 from funkwhale_api.music import models as music_models
-from funkwhale_api.music.serializers import SimpleArtistSerializer, COVER_WRITE_FIELD
+from funkwhale_api.music.serializers import COVER_WRITE_FIELD, SimpleArtistSerializer
 from funkwhale_api.tags import models as tags_models
 from funkwhale_api.tags import serializers as tags_serializers
 from funkwhale_api.users import serializers as users_serializers
 
-from drf_spectacular.utils import extend_schema_field
-from drf_spectacular.types import OpenApiTypes
-
-from . import categories
-from . import models
-
+from . import categories, models
 
 logger = logging.getLogger(__name__)
 

api/funkwhale_api/audio/spa_views.py

@@ -3,12 +3,9 @@ import urllib.parse
 from django.conf import settings
 from django.db.models import Q
 from django.urls import reverse
-
 from rest_framework import serializers
 
-from funkwhale_api.common import preferences
-from funkwhale_api.common import middleware
-from funkwhale_api.common import utils
+from funkwhale_api.common import middleware, preferences, utils
 from funkwhale_api.federation import utils as federation_utils
 from funkwhale_api.music import spa_views
 

api/funkwhale_api/audio/tasks.py

@@ -7,8 +7,7 @@ from django.utils import timezone
 
 from funkwhale_api.taskapp import celery
 
-from . import models
-from . import serializers
+from . import models, serializers
 
 logger = logging.getLogger(__name__)
 

api/funkwhale_api/audio/views.py

@@ -1,20 +1,13 @@
-from rest_framework import decorators
-from rest_framework import exceptions
-from rest_framework import mixins
-from rest_framework import permissions as rest_permissions
-from rest_framework import response
-from rest_framework import viewsets
-
-from drf_spectacular.utils import extend_schema, extend_schema_view
-
 from django import http
 from django.db import transaction
 from django.db.models import Count, Prefetch, Q, Sum
 from django.utils import timezone
+from drf_spectacular.utils import extend_schema, extend_schema_view
+from rest_framework import decorators, exceptions, mixins
+from rest_framework import permissions as rest_permissions
+from rest_framework import response, viewsets
 
-from funkwhale_api.common import locales
-from funkwhale_api.common import permissions
-from funkwhale_api.common import preferences
+from funkwhale_api.common import locales, permissions, preferences
 from funkwhale_api.common import utils as common_utils
 from funkwhale_api.common.mixins import MultipleLookupDetailMixin
 from funkwhale_api.federation import actors