浏览代码

chore(api): black formatting updates

Peter Thomassen 1 年之前
父节点
当前提交
ac554fae0f

+ 5 - 3
api/api/settings_quick_test.py

@@ -9,9 +9,11 @@ DATABASES = {
         "ENGINE": "django.db.backends.postgresql",
         "NAME": "desec",
         "USER": "desec",
-        "HOST": "127.0.0.1"
-        if os.environ.get("DESECSTACK_DJANGO_TEST", "") == "1"
-        else "dbapi",
+        "HOST": (
+            "127.0.0.1"
+            if os.environ.get("DESECSTACK_DJANGO_TEST", "") == "1"
+            else "dbapi"
+        ),
     },
 }
 

+ 8 - 6
api/desecapi/models/domains.py

@@ -197,12 +197,14 @@ class Domain(ExportModelOperationsMixin("Domain"), models.Model):
                     self._keys.append(
                         {
                             "dnskey": rr.content,
-                            "ds": [
-                                dns.dnssec.make_ds(name, key, algo).to_text()
-                                for algo in (2, 4)
-                            ]
-                            if key_is_sep
-                            else [],
+                            "ds": (
+                                [
+                                    dns.dnssec.make_ds(name, key, algo).to_text()
+                                    for algo in (2, 4)
+                                ]
+                                if key_is_sep
+                                else []
+                            ),
                             "flags": key.flags,  # deprecated
                             "keytype": None,  # deprecated
                             "managed": False,

+ 5 - 3
api/desecapi/serializers/domains.py

@@ -115,9 +115,11 @@ class DomainSerializer(serializers.ModelSerializer):
                 {
                     "type": dns.rdatatype.to_text(rrset.rdtype),
                     "ttl": max(min_ttl, min(max_ttl, rrset.ttl)),
-                    "subname": (owner_name - zone_name).to_text()
-                    if owner_name - zone_name != dns.name.empty
-                    else "",
+                    "subname": (
+                        (owner_name - zone_name).to_text()
+                        if owner_name - zone_name != dns.name.empty
+                        else ""
+                    ),
                     "records": [rr.to_text() for rr in rrset],
                 }
                 for owner_name, node in nodes.items()

+ 15 - 9
api/desecapi/tests/base.py

@@ -229,9 +229,11 @@ class AssertRequestsContextManager:
             else:
                 match = self._find_matching_request(
                     request,
-                    unmatched_requests
-                    if self.single_expectation_single_request
-                    else seen_requests,
+                    (
+                        unmatched_requests
+                        if self.single_expectation_single_request
+                        else seen_requests
+                    ),
                 )
 
             # check match
@@ -741,9 +743,11 @@ class MockPDNSTestCase(APITestCase):
                     status,
                     response.status_code,
                     response,
-                    str(response.data).replace("\\n", "\n")
-                    if hasattr(response, "data")
-                    else "",
+                    (
+                        str(response.data).replace("\\n", "\n")
+                        if hasattr(response, "data")
+                        else ""
+                    ),
                 )
             )
 
@@ -1285,9 +1289,11 @@ class PublicSuffixMockMixin:
         else:
             side_effect = partial(
                 self._mock_get_public_suffix,
-                public_suffixes=[side_effect_parameter]
-                if not isinstance(side_effect_parameter, list)
-                else list(side_effect_parameter),
+                public_suffixes=(
+                    [side_effect_parameter]
+                    if not isinstance(side_effect_parameter, list)
+                    else list(side_effect_parameter)
+                ),
             )
 
         return mock.patch.object(psl, "get_public_suffix", side_effect=side_effect)

+ 10 - 6
api/desecapi/tests/test_rrsets.py

@@ -1145,9 +1145,11 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
             )
             self.assertContains(
                 response,
-                text="managed automatically"
-                if _type in RR_SET_TYPES_AUTOMATIC
-                else "type is currently unsupported",
+                text=(
+                    "managed automatically"
+                    if _type in RR_SET_TYPES_AUTOMATIC
+                    else "type is currently unsupported"
+                ),
                 status_code=status.HTTP_400_BAD_REQUEST,
             )
 
@@ -1570,9 +1572,11 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
             with cm:
                 self.assertStatus(
                     self.client.patch_rr_set(domain.name, "www", "A", data),
-                    status.HTTP_204_NO_CONTENT
-                    if allowed
-                    else status.HTTP_404_NOT_FOUND,
+                    (
+                        status.HTTP_204_NO_CONTENT
+                        if allowed
+                        else status.HTTP_404_NOT_FOUND
+                    ),
                 )
 
             self.assertStatus(

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

@@ -14,6 +14,7 @@ This involves testing five separate endpoints:
 
 Furthermore, domain renewals and unused domain/account scavenging are tested.
 """
+
 from datetime import timedelta
 import random
 import time