diff --git a/api/funkwhale_api/common/auth.py b/api/funkwhale_api/common/auth.py index 88010e798f085c4f8c836e9239e844f63c7e41ba..83738a3e948a90eb340c2dd389983eec5281dd4d 100644 --- a/api/funkwhale_api/common/auth.py +++ b/api/funkwhale_api/common/auth.py @@ -1,12 +1,9 @@ from urllib.parse import parse_qs -import jwt from django.contrib.auth.models import AnonymousUser -from django.utils.encoding import smart_text from rest_framework import exceptions -from rest_framework_jwt.settings import api_settings from rest_framework_jwt.authentication import BaseJSONWebTokenAuthentication from funkwhale_api.users.models import User diff --git a/api/funkwhale_api/common/permissions.py b/api/funkwhale_api/common/permissions.py index 82da2c5775ef01766951e450046199a74c40c603..0671645427e688a9b69f44c4f4642cf166985361 100644 --- a/api/funkwhale_api/common/permissions.py +++ b/api/funkwhale_api/common/permissions.py @@ -1,6 +1,5 @@ import operator -from django.conf import settings from django.http import Http404 from rest_framework.permissions import BasePermission diff --git a/api/funkwhale_api/common/scripts/__init__.py b/api/funkwhale_api/common/scripts/__init__.py index 4b2d525202218c43483dae60b6df4f4c6090723e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/api/funkwhale_api/common/scripts/__init__.py +++ b/api/funkwhale_api/common/scripts/__init__.py @@ -1,2 +0,0 @@ -from . import django_permissions_to_user_permissions -from . import test diff --git a/api/funkwhale_api/downloader/__init__.py b/api/funkwhale_api/downloader/__init__.py index 29ec89954d154f28b8bf47248ca040001dc0be60..eca15e121d9be1167e0a72c65de662189242720c 100644 --- a/api/funkwhale_api/downloader/__init__.py +++ b/api/funkwhale_api/downloader/__init__.py @@ -1,2 +1,3 @@ - from .downloader import download + +__all__ = ["download"] diff --git a/api/funkwhale_api/favorites/models.py b/api/funkwhale_api/favorites/models.py index dd2b8f3ec9515c360e2a0a00b5542eecd70c004b..a6a80cebdd0e70d8d5a67293ef4fcbcad3d0e463 100644 --- a/api/funkwhale_api/favorites/models.py +++ b/api/funkwhale_api/favorites/models.py @@ -1,4 +1,3 @@ -from django.conf import settings from django.db import models from django.utils import timezone diff --git a/api/funkwhale_api/favorites/serializers.py b/api/funkwhale_api/favorites/serializers.py index 40260c2aa9b2060ce3dd100d730cf6ec4e82cb66..3cafb80f021488cf0c64244a7dc1b5607d185497 100644 --- a/api/funkwhale_api/favorites/serializers.py +++ b/api/funkwhale_api/favorites/serializers.py @@ -1,4 +1,3 @@ -from django.conf import settings from rest_framework import serializers diff --git a/api/funkwhale_api/favorites/urls.py b/api/funkwhale_api/favorites/urls.py index b85023adeabe907773e397b88c3bc6d05da597a0..69bc01f651f4ebff3448e6f2b0c91ecd7eb454b6 100644 --- a/api/funkwhale_api/favorites/urls.py +++ b/api/funkwhale_api/favorites/urls.py @@ -1,4 +1,3 @@ -from django.conf.urls import include, url from . import views from rest_framework import routers diff --git a/api/funkwhale_api/favorites/views.py b/api/funkwhale_api/favorites/views.py index 7deae7a984dbe82b45056c736ef292951a9a8904..6210ea2cf5b9cc7546c59e0d1316cf630337245a 100644 --- a/api/funkwhale_api/favorites/views.py +++ b/api/funkwhale_api/favorites/views.py @@ -1,7 +1,6 @@ -from rest_framework import generics, mixins, viewsets +from rest_framework import mixins, viewsets from rest_framework import status from rest_framework.response import Response -from rest_framework import pagination from rest_framework.decorators import list_route from funkwhale_api.activity import record diff --git a/api/funkwhale_api/federation/activity.py b/api/funkwhale_api/federation/activity.py index 6dd26a87dc631a16cb1faba911b3f172e3ba7916..73e83e334534bd211daa90a684a1441b5a10907b 100644 --- a/api/funkwhale_api/federation/activity.py +++ b/api/funkwhale_api/federation/activity.py @@ -1,6 +1,3 @@ -from . import serializers -from . import tasks - ACTIVITY_TYPES = [ "Accept", "Add", @@ -52,9 +49,13 @@ OBJECT_TYPES = [ def deliver(activity, on_behalf_of, to=[]): + from . import tasks + return tasks.send.delay(activity=activity, actor_id=on_behalf_of.pk, to=to) def accept_follow(follow): + from . import serializers + serializer = serializers.AcceptFollowSerializer(follow) return deliver(serializer.data, to=[follow.actor.url], on_behalf_of=follow.target) diff --git a/api/funkwhale_api/federation/actors.py b/api/funkwhale_api/federation/actors.py index c6c3bd8167297f6743a2b2a0ebd6525aece56bf2..d42ea575f43b62d389dc5e7e45a8353575035c18 100644 --- a/api/funkwhale_api/federation/actors.py +++ b/api/funkwhale_api/federation/actors.py @@ -9,7 +9,6 @@ from django.utils import timezone from rest_framework.exceptions import PermissionDenied -from dynamic_preferences.registries import global_preferences_registry from funkwhale_api.common import preferences from funkwhale_api.common import session diff --git a/api/funkwhale_api/federation/authentication.py b/api/funkwhale_api/federation/authentication.py index b669b400486666a1a4c3c24cb34f28734f2be62d..a12d510346ede03e7a873a813fe35b944f9eb518 100644 --- a/api/funkwhale_api/federation/authentication.py +++ b/api/funkwhale_api/federation/authentication.py @@ -7,8 +7,6 @@ from rest_framework import exceptions from . import actors from . import keys -from . import models -from . import serializers from . import signing from . import utils diff --git a/api/funkwhale_api/federation/dynamic_preferences_registry.py b/api/funkwhale_api/federation/dynamic_preferences_registry.py index 21f4076eacf1725fd7cca13c9231cb18a1491249..5119d2596fab750b6312d5afbdc3c6d2447b80d0 100644 --- a/api/funkwhale_api/federation/dynamic_preferences_registry.py +++ b/api/funkwhale_api/federation/dynamic_preferences_registry.py @@ -1,4 +1,3 @@ -from django.forms import widgets from dynamic_preferences import types from dynamic_preferences.registries import global_preferences_registry diff --git a/api/funkwhale_api/federation/keys.py b/api/funkwhale_api/federation/keys.py index fb6f0748c9be8e3b057a5271c42e40031d7cba85..bc9416fb85d5e385a9323e8a425607cb6c7d2388 100644 --- a/api/funkwhale_api/federation/keys.py +++ b/api/funkwhale_api/federation/keys.py @@ -5,7 +5,6 @@ from cryptography.hazmat.backends import default_backend as crypto_default_backe import re import urllib.parse -from . import exceptions KEY_ID_REGEX = re.compile(r"keyId=\"(?P<id>.*)\"") diff --git a/api/funkwhale_api/federation/permissions.py b/api/funkwhale_api/federation/permissions.py index ccffb1014c7f486581d6dc1b09ad21e1d7e25e01..c1a39a6902c69702609f76727a97568c4f63fed8 100644 --- a/api/funkwhale_api/federation/permissions.py +++ b/api/funkwhale_api/federation/permissions.py @@ -1,4 +1,3 @@ -from django.conf import settings from rest_framework.permissions import BasePermission diff --git a/api/funkwhale_api/federation/serializers.py b/api/funkwhale_api/federation/serializers.py index 51ae39f0d54c12cdfbdf221969cc747be4e61d45..91ad2eb971dd7c47d1ba97e77d05e50883349315 100644 --- a/api/funkwhale_api/federation/serializers.py +++ b/api/funkwhale_api/federation/serializers.py @@ -1,13 +1,10 @@ import logging import urllib.parse -from django.urls import reverse -from django.conf import settings from django.core.paginator import Paginator from django.db import transaction from rest_framework import serializers -from dynamic_preferences.registries import global_preferences_registry from funkwhale_api.common import utils as funkwhale_utils from funkwhale_api.common import serializers as common_serializers diff --git a/api/funkwhale_api/federation/tasks.py b/api/funkwhale_api/federation/tasks.py index 0e6ee1e609a49c802feef4754db5b21b2e332fd9..596755e3b36b6a2c58e2c58badf1b905a9975a8f 100644 --- a/api/funkwhale_api/federation/tasks.py +++ b/api/funkwhale_api/federation/tasks.py @@ -11,7 +11,6 @@ from requests.exceptions import RequestException from dynamic_preferences.registries import global_preferences_registry from funkwhale_api.common import session -from funkwhale_api.history.models import Listening from funkwhale_api.taskapp import celery from . import actors diff --git a/api/funkwhale_api/federation/views.py b/api/funkwhale_api/federation/views.py index 87564b507208c92da2eb92ff7a3016a08a175b6a..84cd27db67f33b594c4f1c0ff76af01d17bb6cd3 100644 --- a/api/funkwhale_api/federation/views.py +++ b/api/funkwhale_api/federation/views.py @@ -1,24 +1,18 @@ from django import forms -from django.conf import settings from django.core import paginator from django.db import transaction from django.http import HttpResponse from django.urls import reverse from rest_framework import mixins -from rest_framework import permissions as rest_permissions from rest_framework import response -from rest_framework import views from rest_framework import viewsets from rest_framework.decorators import list_route, detail_route -from rest_framework.serializers import ValidationError from funkwhale_api.common import preferences -from funkwhale_api.common import utils as funkwhale_utils from funkwhale_api.music import models as music_models from funkwhale_api.users.permissions import HasUserPermission -from . import activity from . import actors from . import authentication from . import filters diff --git a/api/funkwhale_api/federation/webfinger.py b/api/funkwhale_api/federation/webfinger.py index b37f02e8a8bb8b5abbe4b45346740e0b554dc8fd..fd06d8d5640a093b129f6ac9cf28a68aca0f2250 100644 --- a/api/funkwhale_api/federation/webfinger.py +++ b/api/funkwhale_api/federation/webfinger.py @@ -1,11 +1,9 @@ from django import forms from django.conf import settings -from django.urls import reverse from funkwhale_api.common import session from . import actors -from . import utils from . import serializers VALID_RESOURCE_TYPES = ["acct"] diff --git a/api/funkwhale_api/history/models.py b/api/funkwhale_api/history/models.py index 2edc98fbf34a0cd28e63aead16ab184e9a0946d7..5a72ee449507a6e395dd666d4d05c2fe2944ea64 100644 --- a/api/funkwhale_api/history/models.py +++ b/api/funkwhale_api/history/models.py @@ -1,6 +1,5 @@ from django.utils import timezone from django.db import models -from django.core.exceptions import ValidationError from funkwhale_api.music.models import Track diff --git a/api/funkwhale_api/history/urls.py b/api/funkwhale_api/history/urls.py index 30e0105c05474bb5ccb54be3ebae86d2ceb3dc4d..2c6209757d8e7297ec6ee4a23b46619373666892 100644 --- a/api/funkwhale_api/history/urls.py +++ b/api/funkwhale_api/history/urls.py @@ -1,4 +1,3 @@ -from django.conf.urls import include, url from . import views from rest_framework import routers diff --git a/api/funkwhale_api/history/views.py b/api/funkwhale_api/history/views.py index 057e6b3238439390a24c0c95774313d83e0b30c9..db45cec6925e2bf0c59effeb39794799b3ceea1a 100644 --- a/api/funkwhale_api/history/views.py +++ b/api/funkwhale_api/history/views.py @@ -1,11 +1,7 @@ -from rest_framework import generics, mixins, viewsets +from rest_framework import mixins, viewsets from rest_framework import permissions -from rest_framework import status -from rest_framework.response import Response -from rest_framework.decorators import detail_route from funkwhale_api.activity import record -from funkwhale_api.common.permissions import ConditionalAuthentication from . import models from . import serializers diff --git a/api/funkwhale_api/instance/views.py b/api/funkwhale_api/instance/views.py index 69663c125699adbc6e9cad2344fa184fae71d42e..35432d4889fb08912344561b50c71b1dd66225cd 100644 --- a/api/funkwhale_api/instance/views.py +++ b/api/funkwhale_api/instance/views.py @@ -9,7 +9,6 @@ from funkwhale_api.common import preferences from funkwhale_api.users.permissions import HasUserPermission from . import nodeinfo -from . import stats NODEINFO_2_CONTENT_TYPE = "application/json; profile=http://nodeinfo.diaspora.software/ns/schema/2.0#; charset=utf-8" # noqa diff --git a/api/funkwhale_api/manage/filters.py b/api/funkwhale_api/manage/filters.py index 6bb8a1ccc28ed6c9c89685f0f1a701917ffc3197..2f2bde838fa90695ebc1f077e88650f2d69536c5 100644 --- a/api/funkwhale_api/manage/filters.py +++ b/api/funkwhale_api/manage/filters.py @@ -1,4 +1,3 @@ -from django.db.models import Count from django_filters import rest_framework as filters diff --git a/api/funkwhale_api/music/fake_data.py b/api/funkwhale_api/music/fake_data.py index de7b61ef54699f2919f2cbb91c69362a7f993a66..e5fd65d8ebcb2bb24e0dd0f936cd6fe8e1efcf91 100644 --- a/api/funkwhale_api/music/fake_data.py +++ b/api/funkwhale_api/music/fake_data.py @@ -3,7 +3,6 @@ Populates the database with fake data """ import random -from funkwhale_api.music import models from funkwhale_api.music import factories diff --git a/api/funkwhale_api/music/management/commands/fix_track_files.py b/api/funkwhale_api/music/management/commands/fix_track_files.py index 8f6e4e61d954f14bf5e5e153b964a231621719a4..c494b05abd4b83d252a2078ebb85aa3f4fbd46d4 100644 --- a/api/funkwhale_api/music/management/commands/fix_track_files.py +++ b/api/funkwhale_api/music/management/commands/fix_track_files.py @@ -2,8 +2,7 @@ import cacheops from django.db import transaction from django.db.models import Q -from django.conf import settings -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from funkwhale_api.music import models, utils diff --git a/api/funkwhale_api/music/migrations/0004_track_tags.py b/api/funkwhale_api/music/migrations/0004_track_tags.py index c00f5edfe9e0f79d13cd660a1a782306ab7737ba..b999a70313ce7951fdfed67c534592c55cb834e1 100644 --- a/api/funkwhale_api/music/migrations/0004_track_tags.py +++ b/api/funkwhale_api/music/migrations/0004_track_tags.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations import taggit.managers diff --git a/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py b/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py index 2999df60ccc0d00fe6c638eb61be9eb3dc20c58d..eff0f82a032af7d5441b0d885db5aca3b477f31a 100644 --- a/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py +++ b/api/funkwhale_api/music/migrations/0009_auto_20160920_1614.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.db import migrations, models import django.utils.timezone -import versatileimagefield.fields class Migration(migrations.Migration): diff --git a/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py b/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py index dcb4f79504cc80a281c85020d3c170f8a3458dbc..2b5ce935b7f44f10d6601e1e9e0bae54b8e95e29 100644 --- a/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py +++ b/api/funkwhale_api/music/migrations/0010_auto_20160920_1742.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -import versatileimagefield.fields class Migration(migrations.Migration): diff --git a/api/funkwhale_api/music/migrations/0011_rename_files.py b/api/funkwhale_api/music/migrations/0011_rename_files.py index 2b120370cdd90dc7706f819906d7247d67d64328..2aafb126c5795ed95e889c31f11ba31eb44faf5f 100644 --- a/api/funkwhale_api/music/migrations/0011_rename_files.py +++ b/api/funkwhale_api/music/migrations/0011_rename_files.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -from funkwhale_api.common.utils import rename_file def rename_files(apps, schema_editor): diff --git a/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py b/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py index 016d1c110d319a2effbff460d90e3de5cf8170a7..0cf1e44f074f4b0d7ffb0ae6bdd12cb783f51123 100644 --- a/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py +++ b/api/funkwhale_api/music/migrations/0012_auto_20161122_1905.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations import versatileimagefield.fields diff --git a/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py b/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py index 6806ea8cad08d581e1ce791c8851b23d972c5fa6..c8bd1c5e3c3a464cdd6860f0cf3e1e6a9b0f843c 100644 --- a/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py +++ b/api/funkwhale_api/music/migrations/0015_bind_track_file_to_import_job.py @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models -from funkwhale_api.common.utils import rename_file +from django.db import migrations def bind_jobs(apps, schema_editor): diff --git a/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py b/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py index b3fac0d93e7d0b1f15582f79e0feb7c4310aafe0..11678efbcabfecaefc5d4a58e8459dfd4a04beca 100644 --- a/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py +++ b/api/funkwhale_api/music/migrations/0019_populate_mimetypes.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations from funkwhale_api.music.utils import guess_mimetype diff --git a/api/funkwhale_api/music/migrations/0021_populate_batch_status.py b/api/funkwhale_api/music/migrations/0021_populate_batch_status.py index 25149bda19080de2bbb9b489bbae161fdda63b88..065384a97c7858c30107cbdb31e2b007ca2d10a9 100644 --- a/api/funkwhale_api/music/migrations/0021_populate_batch_status.py +++ b/api/funkwhale_api/music/migrations/0021_populate_batch_status.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations def populate_status(apps, schema_editor): diff --git a/api/funkwhale_api/music/permissions.py b/api/funkwhale_api/music/permissions.py index a85e5a9a6e7f3744cde50da1b9b46812a24ecdd2..ab35337ec53b8cd09d37bf6b9cd48f84b26f1adc 100644 --- a/api/funkwhale_api/music/permissions.py +++ b/api/funkwhale_api/music/permissions.py @@ -1,4 +1,3 @@ -from django.conf import settings from rest_framework.permissions import BasePermission diff --git a/api/funkwhale_api/music/serializers.py b/api/funkwhale_api/music/serializers.py index 7aa8603e2c0b938c51e2dc17156acebdb8e7de2a..d39891aca1a137d29202c0e131e5b78a6120ad77 100644 --- a/api/funkwhale_api/music/serializers.py +++ b/api/funkwhale_api/music/serializers.py @@ -1,12 +1,8 @@ -from django.db import transaction from django.db.models import Q from rest_framework import serializers from taggit.models import Tag from funkwhale_api.activity import serializers as activity_serializers -from funkwhale_api.federation import utils as federation_utils -from funkwhale_api.federation.models import LibraryTrack -from funkwhale_api.federation.serializers import AP_CONTEXT from funkwhale_api.users.serializers import UserBasicSerializer from . import models diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py index 9dcaceec48460794dd07b23208ab0a0862f0099b..dd321e4dd75be0ef2678bba277ac65be97819b07 100644 --- a/api/funkwhale_api/music/tasks.py +++ b/api/funkwhale_api/music/tasks.py @@ -8,7 +8,6 @@ from musicbrainzngs import ResponseError from funkwhale_api.common import preferences from funkwhale_api.federation import activity 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.taskapp import celery from funkwhale_api.providers.acoustid import get_acoustid_client diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py index 6c916b62d147b4787a9328e069fda26ee822885d..1bb169f53f170d0e2988c2237fedb2af6e3182dd 100644 --- a/api/funkwhale_api/music/views.py +++ b/api/funkwhale_api/music/views.py @@ -1,32 +1,24 @@ -import ffmpeg import json import logging -import unicodedata import urllib -from django.contrib.auth.decorators import login_required from django.core.exceptions import ObjectDoesNotExist from django.conf import settings from django.db import models, transaction from django.db.models.functions import Length from django.db.models import Count -from django.http import StreamingHttpResponse -from django.urls import reverse from django.utils import timezone -from django.utils.decorators import method_decorator from rest_framework import viewsets, views, mixins from rest_framework.decorators import detail_route, list_route from rest_framework.response import Response from rest_framework import settings as rest_settings -from rest_framework import permissions from musicbrainzngs import ResponseError from funkwhale_api.common import utils as funkwhale_utils from funkwhale_api.common.permissions import ConditionalAuthentication from funkwhale_api.users.permissions import HasUserPermission from taggit.models import Tag -from funkwhale_api.federation import actors from funkwhale_api.federation.authentication import SignatureAuthentication from funkwhale_api.federation.models import LibraryTrack from funkwhale_api.musicbrainz import api diff --git a/api/funkwhale_api/musicbrainz/__init__.py b/api/funkwhale_api/musicbrainz/__init__.py index 00aa85d5c3ce804e66c3f346e391544a1a4705ee..103da679f942d74894ac500c0ea081d4f4c31439 100644 --- a/api/funkwhale_api/musicbrainz/__init__.py +++ b/api/funkwhale_api/musicbrainz/__init__.py @@ -1 +1,3 @@ from .client import api + +__all__ = ["api"] diff --git a/api/funkwhale_api/musicbrainz/urls.py b/api/funkwhale_api/musicbrainz/urls.py index edb421202394fa922dd3ee41b9056192eeedd1c4..d14447f14a62a73a494e9c6752d67274824f18ed 100644 --- a/api/funkwhale_api/musicbrainz/urls.py +++ b/api/funkwhale_api/musicbrainz/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.conf.urls import url from rest_framework import routers from . import views diff --git a/api/funkwhale_api/musicbrainz/views.py b/api/funkwhale_api/musicbrainz/views.py index 64d4ee15236508546cb7f7e9a17709157b46788f..07271def2d572eb4aed549466a1d4f4a81dbd474 100644 --- a/api/funkwhale_api/musicbrainz/views.py +++ b/api/funkwhale_api/musicbrainz/views.py @@ -2,7 +2,6 @@ from rest_framework import viewsets from rest_framework.views import APIView from rest_framework.response import Response from rest_framework.decorators import list_route -import musicbrainzngs from funkwhale_api.common.permissions import ConditionalAuthentication diff --git a/api/funkwhale_api/playlists/models.py b/api/funkwhale_api/playlists/models.py index ef787d276fd83438c5bc8eaeb0b857756200f094..65ba763237b26829bdca9f615297f88cd4e8ad8d 100644 --- a/api/funkwhale_api/playlists/models.py +++ b/api/funkwhale_api/playlists/models.py @@ -1,4 +1,3 @@ -from django.conf import settings from django.db import models from django.db import transaction from django.utils import timezone diff --git a/api/funkwhale_api/playlists/serializers.py b/api/funkwhale_api/playlists/serializers.py index 3fac68b0e9fb3086aa3a1cdcf7417f7c4a589383..94247611db36b3e26f5154975fdea903063bec18 100644 --- a/api/funkwhale_api/playlists/serializers.py +++ b/api/funkwhale_api/playlists/serializers.py @@ -1,7 +1,5 @@ -from django.conf import settings from django.db import transaction from rest_framework import serializers -from taggit.models import Tag from funkwhale_api.common import preferences from funkwhale_api.music.models import Track diff --git a/api/funkwhale_api/playlists/views.py b/api/funkwhale_api/playlists/views.py index f45d8b2720ff4aaeef304a258b5ae23364d5a26e..2b4075ec97109aa671a9a9613ba51c619319b9d0 100644 --- a/api/funkwhale_api/playlists/views.py +++ b/api/funkwhale_api/playlists/views.py @@ -2,15 +2,13 @@ from django.db.models import Count from django.db import transaction from rest_framework import exceptions -from rest_framework import generics, mixins, viewsets -from rest_framework import status +from rest_framework import mixins, viewsets from rest_framework.decorators import detail_route from rest_framework.response import Response from rest_framework.permissions import IsAuthenticatedOrReadOnly from funkwhale_api.common import permissions from funkwhale_api.common import fields -from funkwhale_api.music.models import Track from . import filters from . import models diff --git a/api/funkwhale_api/providers/urls.py b/api/funkwhale_api/providers/urls.py index 6d001ed9dbd593b59200a43670a871ab3f8916b3..55a1193f503c33784a1876fd6700ab0f28d79041 100644 --- a/api/funkwhale_api/providers/urls.py +++ b/api/funkwhale_api/providers/urls.py @@ -1,5 +1,4 @@ from django.conf.urls import include, url -from funkwhale_api.music import views urlpatterns = [ url( diff --git a/api/funkwhale_api/providers/youtube/client.py b/api/funkwhale_api/providers/youtube/client.py index fbc32efa49eca5cbebd0b28b84e01919356e2d10..94df35166060d68d7e8a287adeecca62c2b72458 100644 --- a/api/funkwhale_api/providers/youtube/client.py +++ b/api/funkwhale_api/providers/youtube/client.py @@ -1,8 +1,6 @@ import threading from apiclient.discovery import build -from apiclient.errors import HttpError -from oauth2client.tools import argparser from dynamic_preferences.registries import global_preferences_registry as registry diff --git a/api/funkwhale_api/providers/youtube/urls.py b/api/funkwhale_api/providers/youtube/urls.py index c496a2c69dd441ef262d8a57fc2e734a4c0cb67a..710eabcac79dc7bb6e29293998898fd261609fbe 100644 --- a/api/funkwhale_api/providers/youtube/urls.py +++ b/api/funkwhale_api/providers/youtube/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.conf.urls import url from .views import APISearch, APISearchs diff --git a/api/funkwhale_api/radios/__init__.py b/api/funkwhale_api/radios/__init__.py index 1258181b5c52430b720cfc558eb44399ce17b0f1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/api/funkwhale_api/radios/__init__.py +++ b/api/funkwhale_api/radios/__init__.py @@ -1 +0,0 @@ -from .registries import registry diff --git a/api/funkwhale_api/radios/filters.py b/api/funkwhale_api/radios/filters.py index cb08e46ed2e20ece86c7847fb67339091f627db5..72e18caf54d4f539b9b462c1748c4cc1795ae0e0 100644 --- a/api/funkwhale_api/radios/filters.py +++ b/api/funkwhale_api/radios/filters.py @@ -7,7 +7,6 @@ from django.urls import reverse_lazy import persisting_theory from funkwhale_api.music import models -from funkwhale_api.taskapp.celery import require_instance class RadioFilterRegistry(persisting_theory.Registry): diff --git a/api/funkwhale_api/radios/models.py b/api/funkwhale_api/radios/models.py index af0fa26da2eee26cc968f411f356f8de098338c0..69f13f9f4608813f0929cb8923406874a3714989 100644 --- a/api/funkwhale_api/radios/models.py +++ b/api/funkwhale_api/radios/models.py @@ -1,6 +1,5 @@ from django.db import models from django.utils import timezone -from django.core.exceptions import ValidationError from django.contrib.postgres.fields import JSONField from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType @@ -77,7 +76,6 @@ class RadioSession(models.Model): @property def radio(self): from .registries import registry - from . import radios return registry[self.radio_type](session=self) diff --git a/api/funkwhale_api/radios/urls.py b/api/funkwhale_api/radios/urls.py index 3f48455b06e1b16a09654e48c9cea786176c0a7c..66c6f37e8eb882feba6bfdb712a6c97130e0cce3 100644 --- a/api/funkwhale_api/radios/urls.py +++ b/api/funkwhale_api/radios/urls.py @@ -1,4 +1,3 @@ -from django.conf.urls import include, url from . import views from rest_framework import routers diff --git a/api/funkwhale_api/radios/views.py b/api/funkwhale_api/radios/views.py index 8478f49e07616a23d4cdfcf4107d67481aaa7c71..4fdd192e62ee352070aefbef1636af2aa202513b 100644 --- a/api/funkwhale_api/radios/views.py +++ b/api/funkwhale_api/radios/views.py @@ -1,14 +1,13 @@ from django.db.models import Q from django.http import Http404 -from rest_framework import generics, mixins, viewsets +from rest_framework import mixins, viewsets from rest_framework import permissions from rest_framework import status from rest_framework.response import Response from rest_framework.decorators import detail_route, list_route from funkwhale_api.music.serializers import TrackSerializer -from funkwhale_api.common.permissions import ConditionalAuthentication from . import models from . import filters diff --git a/api/funkwhale_api/requests/api_urls.py b/api/funkwhale_api/requests/api_urls.py index c7c1a103bd1a65c57d8ba987cb788486db50f8c2..309eba7cdd3633b9ac28304858fadaf3bac6d3cb 100644 --- a/api/funkwhale_api/requests/api_urls.py +++ b/api/funkwhale_api/requests/api_urls.py @@ -1,4 +1,3 @@ -from django.conf.urls import include, url from . import views from rest_framework import routers diff --git a/api/funkwhale_api/requests/views.py b/api/funkwhale_api/requests/views.py index 4b68555a87fab41a3e5c1524f1fb70e09a1f947a..e940c7896fba47c6149e432b4d9ba32c8cc8a1d7 100644 --- a/api/funkwhale_api/requests/views.py +++ b/api/funkwhale_api/requests/views.py @@ -1,7 +1,4 @@ -from rest_framework import generics, mixins, viewsets -from rest_framework import status -from rest_framework.response import Response -from rest_framework.decorators import detail_route +from rest_framework import mixins, viewsets from . import filters from . import models diff --git a/api/funkwhale_api/subsonic/dynamic_preferences_registry.py b/api/funkwhale_api/subsonic/dynamic_preferences_registry.py index 0916b0a3e9a4f17624f2fc1c81705b868dbfb69b..1353ce32c002a5012b6e6c47c441cbacf46c3fe5 100644 --- a/api/funkwhale_api/subsonic/dynamic_preferences_registry.py +++ b/api/funkwhale_api/subsonic/dynamic_preferences_registry.py @@ -1,7 +1,6 @@ from dynamic_preferences import types from dynamic_preferences.registries import global_preferences_registry -from funkwhale_api.common import preferences subsonic = types.Section("subsonic") diff --git a/api/funkwhale_api/users/models.py b/api/funkwhale_api/users/models.py index 281fc4fe8da8fc140989e8aa2f861af8d3b918eb..30320e14b9ca2860e3b65de96ecdc578ea393918 100644 --- a/api/funkwhale_api/users/models.py +++ b/api/funkwhale_api/users/models.py @@ -6,7 +6,7 @@ import os import uuid from django.conf import settings -from django.contrib.auth.models import AbstractUser, Permission +from django.contrib.auth.models import AbstractUser from django.urls import reverse from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/api/tests/activity/test_record.py b/api/tests/activity/test_record.py index 98cefaba213585f1dcae5c05cc3199dfd33e7b58..69d3a28cfa5ec0b325025a0d1bfcf5548a6bfaf5 100644 --- a/api/tests/activity/test_record.py +++ b/api/tests/activity/test_record.py @@ -1,4 +1,3 @@ -import pytest from django.db import models from rest_framework import serializers diff --git a/api/tests/conftest.py b/api/tests/conftest.py index 787831b0042ec8e2e657149d9ee305fc70efde1e..8027ef0ba069a4cbffe45f7f14572644583491ad 100644 --- a/api/tests/conftest.py +++ b/api/tests/conftest.py @@ -17,7 +17,6 @@ from rest_framework.test import APIRequestFactory from funkwhale_api.activity import record from funkwhale_api.users.permissions import HasUserPermission -from funkwhale_api.taskapp import celery @pytest.fixture(scope="session", autouse=True) diff --git a/api/tests/favorites/test_favorites.py b/api/tests/favorites/test_favorites.py index 345c24bdee58c2e287e0a63aab8373c6f740cbb3..8bf7f25b43c4924d6414a96ad9be17276b8e5c43 100644 --- a/api/tests/favorites/test_favorites.py +++ b/api/tests/favorites/test_favorites.py @@ -2,7 +2,6 @@ import json import pytest from django.urls import reverse -from funkwhale_api.music.models import Track, Artist from funkwhale_api.favorites.models import TrackFavorite diff --git a/api/tests/federation/test_actors.py b/api/tests/federation/test_actors.py index f978079dc5c6f1362280850a58d7fe2108749d00..278b10af21329ff9486301a072b3adf952b11b56 100644 --- a/api/tests/federation/test_actors.py +++ b/api/tests/federation/test_actors.py @@ -6,7 +6,6 @@ from django.utils import timezone from rest_framework import exceptions -from funkwhale_api.federation import activity from funkwhale_api.federation import actors from funkwhale_api.federation import models from funkwhale_api.federation import serializers diff --git a/api/tests/federation/test_authentication.py b/api/tests/federation/test_authentication.py index 566a3368dd0e65fa9558096346c9e6e918b27e4b..ea86b64a4c47050416d167395e8bb283c00f3a62 100644 --- a/api/tests/federation/test_authentication.py +++ b/api/tests/federation/test_authentication.py @@ -1,6 +1,5 @@ from funkwhale_api.federation import authentication from funkwhale_api.federation import keys -from funkwhale_api.federation import signing def test_authenticate(factories, mocker, api_request): diff --git a/api/tests/federation/test_models.py b/api/tests/federation/test_models.py index c5defcfee3945b32548b1e0e69480bd8e6dd9cff..08e629ded52f79ffdcb6b301bd33f584f07382e4 100644 --- a/api/tests/federation/test_models.py +++ b/api/tests/federation/test_models.py @@ -2,8 +2,6 @@ import pytest from django import db -from funkwhale_api.federation import models -from funkwhale_api.federation import serializers def test_cannot_duplicate_actor(factories): diff --git a/api/tests/federation/test_serializers.py b/api/tests/federation/test_serializers.py index ffcbd441df5608cba28fbe6543c580b6686446cd..2d3bad358d3f1834b5a02c8812c7a7bf18bad440 100644 --- a/api/tests/federation/test_serializers.py +++ b/api/tests/federation/test_serializers.py @@ -1,11 +1,9 @@ import arrow import pytest -from django.urls import reverse from django.core.paginator import Paginator from funkwhale_api.federation import actors -from funkwhale_api.federation import keys from funkwhale_api.federation import models from funkwhale_api.federation import serializers from funkwhale_api.federation import utils diff --git a/api/tests/federation/test_signing.py b/api/tests/federation/test_signing.py index 1ebaaf82626ec3b83ec4e45f0483e5bfd86a9e1a..611f2d735ff88ad9b93abda67cc977771cc5829e 100644 --- a/api/tests/federation/test_signing.py +++ b/api/tests/federation/test_signing.py @@ -1,6 +1,5 @@ import cryptography.exceptions import pytest -import requests_http_signature from funkwhale_api.federation import signing from funkwhale_api.federation import keys diff --git a/api/tests/federation/test_tasks.py b/api/tests/federation/test_tasks.py index f6fafffd6082127169df8bbd626dbd7d621f0ec9..068578c5ecc98430e8731250834f98b06d5aba99 100644 --- a/api/tests/federation/test_tasks.py +++ b/api/tests/federation/test_tasks.py @@ -1,7 +1,6 @@ import datetime import os import pathlib -import pytest from django.core.paginator import Paginator from django.utils import timezone diff --git a/api/tests/federation/test_webfinger.py b/api/tests/federation/test_webfinger.py index 1b7db92789339ca1eac3f75c14b463a6686b7a54..de6112713f385f0ad9b28eccd390805ac93c9cf2 100644 --- a/api/tests/federation/test_webfinger.py +++ b/api/tests/federation/test_webfinger.py @@ -1,7 +1,6 @@ import pytest from django import forms -from django.urls import reverse from funkwhale_api.federation import webfinger diff --git a/api/tests/history/test_history.py b/api/tests/history/test_history.py index e43e79ba70e0ae54558cf0eb1a0e0a47d41c85cc..fcf34dadf5ca457ccbf690fed4ead2fbc010e18e 100644 --- a/api/tests/history/test_history.py +++ b/api/tests/history/test_history.py @@ -1,6 +1,4 @@ from django.urls import reverse -from django.core.exceptions import ValidationError -from django.utils import timezone from funkwhale_api.history import models diff --git a/api/tests/instance/test_nodeinfo.py b/api/tests/instance/test_nodeinfo.py index 3c2fa862ee17e68d0344fa83562d28958b1a8d69..7637ca319f716c9136ee0c49b96927abc3ec7b3c 100644 --- a/api/tests/instance/test_nodeinfo.py +++ b/api/tests/instance/test_nodeinfo.py @@ -1,4 +1,3 @@ -from django.urls import reverse import funkwhale_api diff --git a/api/tests/instance/test_preferences.py b/api/tests/instance/test_preferences.py index 85932145b51fb0c275620f8e7b5f59b5518686b9..cf73c7c8055244c6cb03cf4e2cde3fce34ea731b 100644 --- a/api/tests/instance/test_preferences.py +++ b/api/tests/instance/test_preferences.py @@ -2,7 +2,6 @@ import pytest from django.urls import reverse -from dynamic_preferences.api import serializers def test_can_list_settings_via_api(preferences, api_client): diff --git a/api/tests/instance/test_stats.py b/api/tests/instance/test_stats.py index 9e60d1cdd4e0677c04bf77963ecf6398b32868e8..d42b47c0372bafb9066c23986adc42545098f6b0 100644 --- a/api/tests/instance/test_stats.py +++ b/api/tests/instance/test_stats.py @@ -1,4 +1,3 @@ -from django.urls import reverse from funkwhale_api.instance import stats diff --git a/api/tests/music/test_activity.py b/api/tests/music/test_activity.py index 0d9879300c8fc1279260b2a76be63deac7f97488..5286f1fef1c19cf0e1163f035dcc0d20100a59b3 100644 --- a/api/tests/music/test_activity.py +++ b/api/tests/music/test_activity.py @@ -1,5 +1,3 @@ -from funkwhale_api.users.serializers import UserActivitySerializer -from funkwhale_api.favorites import serializers def test_get_track_activity_url_mbid(factories): diff --git a/api/tests/music/test_api.py b/api/tests/music/test_api.py index d7d37bd4b1fb81bd4e415011a00e32707c1dfbc4..11b3e92732f221421e456d9d2fbbdd75bfa9c93f 100644 --- a/api/tests/music/test_api.py +++ b/api/tests/music/test_api.py @@ -4,8 +4,6 @@ import pytest from django.urls import reverse from funkwhale_api.music import models -from funkwhale_api.musicbrainz import api -from funkwhale_api.music import serializers from funkwhale_api.music import tasks diff --git a/api/tests/music/test_import.py b/api/tests/music/test_import.py index aae3583ed4fe753e0667f37f61101ae7e2f000e2..13e8343fcff70a0a1161c8382ed5e1ef4dc9b3d4 100644 --- a/api/tests/music/test_import.py +++ b/api/tests/music/test_import.py @@ -1,6 +1,5 @@ import json import os -import pytest from django.urls import reverse diff --git a/api/tests/music/test_lyrics.py b/api/tests/music/test_lyrics.py index 5d97c7ae206125f26f9a13806829d4d1a82cc153..81bbbe4810370030b404c5ebacb09f39c06d77dd 100644 --- a/api/tests/music/test_lyrics.py +++ b/api/tests/music/test_lyrics.py @@ -1,8 +1,6 @@ from django.urls import reverse from funkwhale_api.music import models -from funkwhale_api.musicbrainz import api -from funkwhale_api.music import serializers from funkwhale_api.music import tasks from funkwhale_api.music import lyrics as lyrics_utils diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py index f38f4143918b2b511eab732a0e4ee3e756dfa656..01e6d91ac5489752198adc7fb2663c1a6c1f3806 100644 --- a/api/tests/music/test_tasks.py +++ b/api/tests/music/test_tasks.py @@ -1,7 +1,6 @@ import os import pytest -from funkwhale_api.providers.acoustid import get_acoustid_client from funkwhale_api.music import tasks DATA_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/api/tests/music/test_works.py b/api/tests/music/test_works.py index 0d3c11ff0d1458321950c2810cc6ff40b4f6b033..bd69c8ab97c5f94188ada923ff3f23f776f5866b 100644 --- a/api/tests/music/test_works.py +++ b/api/tests/music/test_works.py @@ -1,8 +1,5 @@ -from django.urls import reverse from funkwhale_api.music import models -from funkwhale_api.musicbrainz import api -from funkwhale_api.music import serializers def test_can_import_work(factories, mocker, works): diff --git a/api/tests/musicbrainz/test_api.py b/api/tests/musicbrainz/test_api.py index a9f76890ee62a493187bf080d37d8ca9d5f74056..f1f9912c40c5b3b27f129c63180c385d31c6534a 100644 --- a/api/tests/musicbrainz/test_api.py +++ b/api/tests/musicbrainz/test_api.py @@ -1,6 +1,5 @@ from django.urls import reverse -from funkwhale_api.musicbrainz import api def test_can_search_recording_in_musicbrainz_api( diff --git a/api/tests/playlists/test_views.py b/api/tests/playlists/test_views.py index 2cb1184721207f0e2c2d9fa7b7f77b688974efcb..a675993e72daa370367c63faf2ef26a70c410387 100644 --- a/api/tests/playlists/test_views.py +++ b/api/tests/playlists/test_views.py @@ -1,8 +1,6 @@ import pytest from django.urls import reverse -from django.core.exceptions import ValidationError -from django.utils import timezone from funkwhale_api.playlists import models from funkwhale_api.playlists import serializers diff --git a/api/tests/radios/test_api.py b/api/tests/radios/test_api.py index 4a72d81ba02b69b436bdbbda44f83e454a955f25..5f19128007615165b78c374b6f426c94fbde47c9 100644 --- a/api/tests/radios/test_api.py +++ b/api/tests/radios/test_api.py @@ -1,5 +1,4 @@ import json -import pytest from django.urls import reverse diff --git a/api/tests/requests/test_models.py b/api/tests/requests/test_models.py index d6b71635afd1eb5517c854304f88ab18b95abcda..f23fc9ef2eb042eabef84656131998a7731d0629 100644 --- a/api/tests/requests/test_models.py +++ b/api/tests/requests/test_models.py @@ -1,6 +1,4 @@ -import pytest -from django.forms import ValidationError def test_can_bind_import_batch_to_request(factories): diff --git a/api/tests/test_import_audio_file.py b/api/tests/test_import_audio_file.py index b9961a0022a1bba161b5791e87c03edb97182643..38b7d2620e72aa916d7b03d6bbfb3c309cbb0d53 100644 --- a/api/tests/test_import_audio_file.py +++ b/api/tests/test_import_audio_file.py @@ -6,7 +6,6 @@ from django.core.management import call_command from django.core.management.base import CommandError from funkwhale_api.providers.audiofile import tasks -from funkwhale_api.music import tasks as music_tasks DATA_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "files") diff --git a/api/tests/users/test_jwt.py b/api/tests/users/test_jwt.py index 771a42efa53891736144d77feb06c62088f1a956..e4038b1edbc8602810b90a5022ecd2059c7fce5c 100644 --- a/api/tests/users/test_jwt.py +++ b/api/tests/users/test_jwt.py @@ -3,7 +3,6 @@ import pytest from jwt.exceptions import DecodeError from rest_framework_jwt.settings import api_settings -from funkwhale_api.users.models import User def test_can_invalidate_token_when_changing_user_secret_key(factories): diff --git a/api/tests/users/test_views.py b/api/tests/users/test_views.py index 78d6aa4bd9c4cbf8152a599e182989e1fd4ab234..fa5793e9b9a8dfb11c97654af60512fa26fcf590 100644 --- a/api/tests/users/test_views.py +++ b/api/tests/users/test_views.py @@ -1,6 +1,5 @@ import pytest -from django.test import RequestFactory from django.urls import reverse from funkwhale_api.users.models import User