浏览代码

fix(api): remove/ignore PyCharm code style warnings

Nils Wisiol 6 年之前
父节点
当前提交
7c79c495ae

+ 1 - 1
api/api/settings.py

@@ -111,7 +111,7 @@ DJOSER = {
 
 
 # CORS
 # CORS
 # No need to add Authorization to CORS_ALLOW_HEADERS (included by default)
 # No need to add Authorization to CORS_ALLOW_HEADERS (included by default)
-CORS_ORIGIN_ALLOW_ALL=True
+CORS_ORIGIN_ALLOW_ALL = True
 
 
 TEMPLATES = [
 TEMPLATES = [
     {
     {

+ 1 - 0
api/api/settings_quick_test.py

@@ -1,3 +1,4 @@
+# noinspection PyUnresolvedReferences
 from api.settings import *
 from api.settings import *
 
 
 # noinspection PyUnresolvedReferences
 # noinspection PyUnresolvedReferences

+ 1 - 1
api/desecapi/authentication.py

@@ -49,7 +49,7 @@ class BasicTokenAuthentication(BaseAuthentication):
             user, key = base64.b64decode(basic).decode(HTTP_HEADER_ENCODING).split(':')
             user, key = base64.b64decode(basic).decode(HTTP_HEADER_ENCODING).split(':')
             token = self.model.objects.get(key=key)
             token = self.model.objects.get(key=key)
             domain_names = token.user.domains.values_list('name', flat=True)
             domain_names = token.user.domains.values_list('name', flat=True)
-            if not user in ['', token.user.email] and not user.lower() in domain_names:
+            if user not in ['', token.user.email] and not user.lower() in domain_names:
                 raise Exception
                 raise Exception
         except Exception:
         except Exception:
             raise exceptions.AuthenticationFailed(invalid_token_message)
             raise exceptions.AuthenticationFailed(invalid_token_message)

+ 1 - 0
api/desecapi/tests/base.py

@@ -136,6 +136,7 @@ class AssertRequestsContextManager:
     def __enter__(self):
     def __enter__(self):
         hr_core.POTENTIAL_HTTP_PORTS.add(8081)  # FIXME should depend on self.expected_requests
         hr_core.POTENTIAL_HTTP_PORTS.add(8081)  # FIXME should depend on self.expected_requests
         self.expected_requests = self.expected_requests
         self.expected_requests = self.expected_requests
+        # noinspection PyProtectedMember
         self.old_httpretty_entries = httpretty._entries.copy()  # FIXME accessing private properties of httpretty
         self.old_httpretty_entries = httpretty._entries.copy()  # FIXME accessing private properties of httpretty
         for request in self.expected_requests:
         for request in self.expected_requests:
             httpretty.register_uri(**request)
             httpretty.register_uri(**request)

+ 15 - 14
api/desecapi/tests/test_authentication.py

@@ -12,23 +12,24 @@ class DynUpdateAuthenticationTestCase(DynDomainOwnerTestCase):
         with self.assertPdnsNoRequestsBut(self.requests_desec_rr_sets_update()):
         with self.assertPdnsNoRequestsBut(self.requests_desec_rr_sets_update()):
             return self.client.get(self.reverse('v1:dyndns12update'))
             return self.client.get(self.reverse('v1:dyndns12update'))
 
 
-    def assertDynDNS12Status(self, status=HTTP_200_OK, authorization=None):
+    def assertDynDNS12Status(self, code=HTTP_200_OK, authorization=None):
         if authorization:
         if authorization:
             self.client.set_credentials_basic_auth(authorization)
             self.client.set_credentials_basic_auth(authorization)
-        self.assertStatus(self._get_dyndns12(), status)
+        self.assertStatus(self._get_dyndns12(), code)
 
 
     def test_username_password(self):
     def test_username_password(self):
-        def _test_DynDNS12AuthenticationStatus(username, token, status):
+        # noinspection PyPep8Naming
+        def assertDynDNS12AuthenticationStatus(username, token, code):
             self.client.set_credentials_basic_auth(username, token)
             self.client.set_credentials_basic_auth(username, token)
-            self.assertDynDNS12Status(status)
+            self.assertDynDNS12Status(code)
 
 
-        _test_DynDNS12AuthenticationStatus('', self.token.key, HTTP_200_OK)
-        _test_DynDNS12AuthenticationStatus(self.owner.get_username(), self.token.key, HTTP_200_OK)
-        _test_DynDNS12AuthenticationStatus(self.my_domain.name, self.token.key, HTTP_200_OK)
-        _test_DynDNS12AuthenticationStatus(' ' + self.my_domain.name, self.token.key, HTTP_401_UNAUTHORIZED)
-        _test_DynDNS12AuthenticationStatus('wrong', self.token.key, HTTP_401_UNAUTHORIZED)
-        _test_DynDNS12AuthenticationStatus('', 'wrong', HTTP_401_UNAUTHORIZED)
-        _test_DynDNS12AuthenticationStatus(self.user.get_username(), 'wrong', HTTP_401_UNAUTHORIZED)
+        assertDynDNS12AuthenticationStatus('', self.token.key, HTTP_200_OK)
+        assertDynDNS12AuthenticationStatus(self.owner.get_username(), self.token.key, HTTP_200_OK)
+        assertDynDNS12AuthenticationStatus(self.my_domain.name, self.token.key, HTTP_200_OK)
+        assertDynDNS12AuthenticationStatus(' ' + self.my_domain.name, self.token.key, HTTP_401_UNAUTHORIZED)
+        assertDynDNS12AuthenticationStatus('wrong', self.token.key, HTTP_401_UNAUTHORIZED)
+        assertDynDNS12AuthenticationStatus('', 'wrong', HTTP_401_UNAUTHORIZED)
+        assertDynDNS12AuthenticationStatus(self.user.get_username(), 'wrong', HTTP_401_UNAUTHORIZED)
 
 
     def test_malformed_basic_auth(self):
     def test_malformed_basic_auth(self):
         for authorization in [
         for authorization in [
@@ -39,7 +40,7 @@ class DynUpdateAuthenticationTestCase(DynDomainOwnerTestCase):
             '💩💩💩💩',
             '💩💩💩💩',
             '💩💩:💩💩',
             '💩💩:💩💩',
         ]:
         ]:
-            self.assertDynDNS12Status(authorization=authorization, status=HTTP_401_UNAUTHORIZED)
+            self.assertDynDNS12Status(authorization=authorization, code=HTTP_401_UNAUTHORIZED)
 
 
 
 
 class SignUpLoginTestCase(DesecTestCase):
 class SignUpLoginTestCase(DesecTestCase):
@@ -115,9 +116,9 @@ class TokenAuthenticationTestCase(DynDomainOwnerTestCase):
         with self.assertPdnsNoRequestsBut(self.request_pdns_zone_retrieve_crypto_keys()):
         with self.assertPdnsNoRequestsBut(self.request_pdns_zone_retrieve_crypto_keys()):
             return self.client.get(self.reverse('v1:domain-list'))
             return self.client.get(self.reverse('v1:domain-list'))
 
 
-    def assertAuthenticationStatus(self, status=HTTP_200_OK, token=''):
+    def assertAuthenticationStatus(self, code=HTTP_200_OK, token=''):
         self.client.set_credentials_token_auth(token)
         self.client.set_credentials_token_auth(token)
-        self.assertStatus(self._get_domains(), status)
+        self.assertStatus(self._get_domains(), code)
 
 
     def test_token_case_sensitive(self):
     def test_token_case_sensitive(self):
         self.assertAuthenticationStatus(HTTP_200_OK, self.token.key)
         self.assertAuthenticationStatus(HTTP_200_OK, self.token.key)