From 4811f35eb5c66a06fae3e8f85da6d374d3230be1 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Thu, 10 Jan 2019 11:10:39 +0100
Subject: [PATCH] Linting
---
api/funkwhale_api/federation/authentication.py | 12 ++++++------
api/funkwhale_api/federation/exceptions.py | 1 -
api/funkwhale_api/federation/utils.py | 3 +--
api/tests/federation/test_utils.py | 2 +-
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/api/funkwhale_api/federation/authentication.py b/api/funkwhale_api/federation/authentication.py
index 6f0fd329..adfb8a18 100644
--- a/api/funkwhale_api/federation/authentication.py
+++ b/api/funkwhale_api/federation/authentication.py
@@ -2,7 +2,7 @@ import cryptography
import logging
from django.contrib.auth.models import AnonymousUser
-from rest_framework import authentication, exceptions
+from rest_framework import authentication, exceptions as rest_exceptions
from funkwhale_api.moderation import models as moderation_models
from . import actors, exceptions, keys, signing, utils
@@ -20,12 +20,12 @@ class SignatureAuthentication(authentication.BaseAuthentication):
except KeyError:
return
except ValueError as e:
- raise exceptions.AuthenticationFailed(str(e))
+ raise rest_exceptions.AuthenticationFailed(str(e))
try:
actor_url = key_id.split("#")[0]
except (TypeError, IndexError, AttributeError):
- raise exceptions.AuthenticationFailed("Invalid key id")
+ raise rest_exceptions.AuthenticationFailed("Invalid key id")
policies = (
moderation_models.InstancePolicy.objects.active()
@@ -41,15 +41,15 @@ class SignatureAuthentication(authentication.BaseAuthentication):
logger.info(
"Discarding HTTP request from blocked actor/domain %s", actor_url
)
- raise exceptions.AuthenticationFailed(str(e))
+ raise rest_exceptions.AuthenticationFailed(str(e))
if not actor.public_key:
- raise exceptions.AuthenticationFailed("No public key found")
+ raise rest_exceptions.AuthenticationFailed("No public key found")
try:
signing.verify_django(request, actor.public_key.encode("utf-8"))
except cryptography.exceptions.InvalidSignature:
- raise exceptions.AuthenticationFailed("Invalid signature")
+ raise rest_exceptions.AuthenticationFailed("Invalid signature")
return actor
diff --git a/api/funkwhale_api/federation/exceptions.py b/api/funkwhale_api/federation/exceptions.py
index 303a0c4b..eb2bd216 100644
--- a/api/funkwhale_api/federation/exceptions.py
+++ b/api/funkwhale_api/federation/exceptions.py
@@ -1,4 +1,3 @@
-from rest_framework import authentication, exceptions
from rest_framework import exceptions
diff --git a/api/funkwhale_api/federation/utils.py b/api/funkwhale_api/federation/utils.py
index f29608a2..e49a4dd6 100644
--- a/api/funkwhale_api/federation/utils.py
+++ b/api/funkwhale_api/federation/utils.py
@@ -1,7 +1,6 @@
import unicodedata
import re
from django.conf import settings
-from django.db.models import Q
from funkwhale_api.common import session
from funkwhale_api.moderation import models as moderation_models
@@ -64,7 +63,7 @@ def slugify_username(username):
def retrieve_ap_object(
fid, actor=None, serializer_class=None, queryset=None, apply_instance_policies=True
):
- from . import activity, serializers
+ from . import activity
policies = moderation_models.InstancePolicy.objects.active().filter(block_all=True)
if apply_instance_policies and policies.matching_url(fid):
diff --git a/api/tests/federation/test_utils.py b/api/tests/federation/test_utils.py
index 761f44d3..a8d02cdb 100644
--- a/api/tests/federation/test_utils.py
+++ b/api/tests/federation/test_utils.py
@@ -79,7 +79,7 @@ def test_retrieve_ap_object_honor_instance_policy_different_url_and_id(
block_all=True, for_domain=True
).target_domain
fid = "https://ok/test"
- m = r_mock.get(fid, json={"id": "http://{}/test".format(domain.name)})
+ r_mock.get(fid, json={"id": "http://{}/test".format(domain.name)})
with pytest.raises(exceptions.BlockedActorOrDomain):
utils.retrieve_ap_object(fid)
--
GitLab