浏览代码

chore(api): code style

Peter Thomassen 5 年之前
父节点
当前提交
fed585f810
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 0 1
      api/api/settings_quick_test.py
  2. 4 3
      api/desecapi/tests/test_user_management.py
  3. 2 2
      api/desecapi/views.py

+ 0 - 1
api/api/settings_quick_test.py

@@ -10,7 +10,6 @@ DATABASES = {
             'CHARSET': 'utf8mb4',
         },
     },
-
 }
 
 # avoid computationally expensive password hashing for tests

+ 4 - 3
api/desecapi/tests/test_user_management.py

@@ -26,7 +26,7 @@ from rest_framework.reverse import reverse
 from rest_framework.test import APIClient
 
 from api import settings
-from desecapi.models import Domain, User, Captcha, Token
+from desecapi.models import Domain, User, Captcha
 from desecapi.serializers import AuthenticatedActionSerializer
 from desecapi.tests.base import DesecTestCase, PublicSuffixMockMixin
 
@@ -87,8 +87,9 @@ class UserManagementTestCase(DesecTestCase, PublicSuffixMockMixin):
     token = None
 
     def get_captcha(self):
-        data = self.client.obtain_captcha().data
-        id = data['id']
+        response = self.client.obtain_captcha()
+        self.assertStatus(response, status.HTTP_201_CREATED)
+        id = response.data['id']
         solution = Captcha.objects.get(id=id).content
         return id, solution
 

+ 2 - 2
api/desecapi/views.py

@@ -57,7 +57,7 @@ class TokenViewSet(IdempotentDestroy,
                    mixins.ListModelMixin,
                    GenericViewSet):
     serializer_class = serializers.TokenSerializer
-    permission_classes = (IsAuthenticated, )
+    permission_classes = (IsAuthenticated,)
 
     def get_queryset(self):
         return self.request.user.auth_tokens.all()
@@ -529,7 +529,7 @@ class AuthenticatedActionView(generics.GenericAPIView):
 
     def get(self, request, *args, **kwargs):
         # Redirect browsers to frontend if available
-        is_redirect = (request.accepted_renderer.format == 'html') and self.html_url
+        is_redirect = (request.accepted_renderer.format == 'html') and self.html_url is not None
         if is_redirect:
             # Careful: This can generally lead to an open redirect if values contain slashes!
             # However, it cannot happen for Django view kwargs.