]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
re-run black
authorBob Halley <halley@dnspython.org>
Sun, 19 Mar 2023 16:31:03 +0000 (09:31 -0700)
committerBob Halley <halley@dnspython.org>
Sun, 19 Mar 2023 16:31:03 +0000 (09:31 -0700)
13 files changed:
dns/asyncresolver.py
dns/entropy.py
dns/message.py
dns/rdata.py
dns/tsigkeyring.py
dns/update.py
dns/win32util.py
tests/test_immutable.py
tests/test_nsec3_hash.py
tests/test_ntoaaton.py
tests/test_query.py
tests/test_rdtypeandclass.py
tests/test_zone.py

index 55ef0fb75254304c099135635439795fef87d064..7b18b32cb182d451b5684c99803a9b42a0504631 100644 (file)
@@ -136,12 +136,11 @@ class Resolver(dns.resolver.BaseResolver):
             dns.reversename.from_address(ipaddr), *args, **modified_kwargs
         )
 
-
     async def resolve_name(
         self,
         name: Union[dns.name.Name, str],
         family: int = socket.AF_UNSPEC,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> dns.resolver.HostAnswers:
         """Use an asynchronous resolver to query for address records.
 
@@ -174,33 +173,36 @@ class Resolver(dns.resolver.BaseResolver):
         elif family != socket.AF_UNSPEC:
             raise NotImplementedError(f"unknown address family {family}")
 
-        raise_on_no_answer = modified_kwargs.pop('raise_on_no_answer', True)
-        lifetime = modified_kwargs.pop('lifetime', None)
+        raise_on_no_answer = modified_kwargs.pop("raise_on_no_answer", True)
+        lifetime = modified_kwargs.pop("lifetime", None)
         start = time.time()
-        v6 = await self.resolve(name, dns.rdatatype.AAAA,
-                                raise_on_no_answer=False,
-                                lifetime=self._compute_timeout(start, lifetime),
-                                **modified_kwargs)
+        v6 = await self.resolve(
+            name,
+            dns.rdatatype.AAAA,
+            raise_on_no_answer=False,
+            lifetime=self._compute_timeout(start, lifetime),
+            **modified_kwargs,
+        )
         # Note that setting name ensures we query the same name
         # for A as we did for AAAA.  (This is just in case search lists
         # are active by default in the resolver configuration and
         # we might be talking to a server that says NXDOMAIN when it
         # wants to say NOERROR no data.
         name = v6.qname
-        v4 = await self.resolve(name, dns.rdatatype.A,
-                                raise_on_no_answer=False,
-                                lifetime=self._compute_timeout(start, lifetime),
-                                **modified_kwargs)
+        v4 = await self.resolve(
+            name,
+            dns.rdatatype.A,
+            raise_on_no_answer=False,
+            lifetime=self._compute_timeout(start, lifetime),
+            **modified_kwargs,
+        )
         answers = dns.resolver.HostAnswers.make(
-            v6=v6,
-            v4=v4,
-            add_empty=not raise_on_no_answer
+            v6=v6, v4=v4, add_empty=not raise_on_no_answer
         )
         if not answers:
             raise NoAnswer(response=v6.response)
         return answers
 
-
     # pylint: disable=redefined-outer-name
 
     async def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
@@ -295,9 +297,7 @@ async def resolve_address(
 
 
 async def resolve_name(
-    name: Union[dns.name.Name, str],
-    family: int = socket.AF_UNSPEC,
-    **kwargs: Any
+    name: Union[dns.name.Name, str], family: int = socket.AF_UNSPEC, **kwargs: Any
 ) -> dns.resolver.HostAnswers:
     """Use a resolver to asynchronously query for address records.
 
index 5e1f5e236e488373091357c68cd68115dcc652a9..36168181527e347ff8ebf2c607c090877c2f6418 100644 (file)
@@ -25,7 +25,6 @@ import time
 
 
 class EntropyPool:
-
     # This is an entropy pool for Python implementations that do not
     # have a working SystemRandom.  I'm not sure there are any, but
     # leaving this code doesn't hurt anything as the library code
index 8250db3b0ac8a16f1cb02636007b2052c84ead06..082fb7b6dbe188975e682bd202227083f1a35b84 100644 (file)
@@ -231,7 +231,7 @@ class Message:
             s.write("payload %d\n" % self.payload)
         for opt in self.options:
             s.write("option %s\n" % opt.to_text())
-        for (name, which) in self._section_enum.__members__.items():
+        for name, which in self._section_enum.__members__.items():
             s.write(f";{name}\n")
             for rrset in self.section_from_number(which):
                 s.write(rrset.to_text(origin, relativize, **kw))
index 1dd6ed90ce58dc8f787701c656598f6f94229cdd..d166b8abbc648025f4c81b59b448e161efe2a1a9 100644 (file)
@@ -358,7 +358,6 @@ class Rdata:
             or self.rdclass != other.rdclass
             or self.rdtype != other.rdtype
         ):
-
             return NotImplemented
         return self._cmp(other) < 0
 
index 6adba284d70bf07fd42df3f5a59256c89659440c..1f8bc5ff103d79769f04f6c9aa39c83af67925e6 100644 (file)
@@ -33,7 +33,7 @@ def from_text(textring: Dict[str, Any]) -> Dict[dns.name.Name, dns.tsig.Key]:
     @rtype: dict"""
 
     keyring = {}
-    for (name, value) in textring.items():
+    for name, value in textring.items():
         kname = dns.name.from_text(name)
         if isinstance(value, str):
             keyring[kname] = dns.tsig.Key(kname, value).secret
@@ -55,7 +55,7 @@ def to_text(keyring: Dict[dns.name.Name, Any]) -> Dict[str, Any]:
     def b64encode(secret):
         return base64.encodebytes(secret).decode().rstrip()
 
-    for (name, key) in keyring.items():
+    for name, key in keyring.items():
         tname = name.to_text()
         if isinstance(key, bytes):
             textring[tname] = b64encode(key)
index 647e5b19780d06127bff2dd23079afbc863de0b6..b10f6ace5ec8f7f66202aecca59ad94a61d5f628 100644 (file)
@@ -43,7 +43,6 @@ class UpdateSection(dns.enum.IntEnum):
 
 
 class UpdateMessage(dns.message.Message):  # lgtm[py/missing-equals]
-
     # ignore the mypy error here as we mean to use a different enum
     _section_enum = UpdateSection  # type: ignore
 
index ac31475023fd049532a0d3150fc7f06c48ebc578..f9fda98fe3806d92069bcf318c7de7ac6fe9256e 100644 (file)
@@ -1,7 +1,6 @@
 import sys
 
 if sys.platform == "win32":
-
     from typing import Any
 
     import dns.name
index fa762d896a15d6021eca03d5bc757d8893a133c3..657d1b765d978928255f546ad4ba93ecebc9a6d7 100644 (file)
@@ -39,7 +39,6 @@ class ImmutableTestCase(unittest.TestCase):
 
 
 class DecoratorTestCase(unittest.TestCase):
-
     immutable_module = dns._immutable_ctx
 
     def make_classes(self):
@@ -125,7 +124,6 @@ class DecoratorTestCase(unittest.TestCase):
         self.assertFalse(hasattr(a, "b"))
 
     def test_no_collateral_damage(self):
-
         # A and B are immutable but not related.  The magic that lets
         # us write to immutable things while initializing B should not let
         # B mess with A.
index 8cb6792a4000c591821308c085b336c2e6bcbf48..f16616e1959397d116ea7fe96f7e29b341a186dc 100644 (file)
@@ -6,7 +6,6 @@ from dns import dnssec, name
 
 
 class NSEC3Hash(unittest.TestCase):
-
     DATA = [
         # Source: https://tools.ietf.org/html/rfc5155#appendix-A
         ("example", "aabbccdd", 12, "0p9mhaveqvm6t7vbl5lop2u3t2rp3tom", 1),
index 2468486b798f0d8def6192e14c4bb7f97b0b2e79..94386cec1bfb4c4676bbcf42c522751b6ff2743f 100644 (file)
@@ -205,7 +205,7 @@ class NtoAAtoNTestCase(unittest.TestCase):
             ("255.255.255.255", b"\xff\xff\xff\xff"),
             ("0.0.0.0", b"\x00\x00\x00\x00"),
         ]
-        for (t, b) in pairs:
+        for t, b in pairs:
             b1 = aton4(t)
             t1 = ntoa4(b1)
             self.assertEqual(b1, b)
@@ -289,14 +289,14 @@ class NtoAAtoNTestCase(unittest.TestCase):
         self.assertRaises(dns.exception.SyntaxError, bad)
 
     def test_ptontop(self):
-        for (af, a) in [
+        for af, a in [
             (socket.AF_INET, "1.2.3.4"),
             (socket.AF_INET6, "2001:db8:0:1:1:1:1:1"),
         ]:
             self.assertEqual(dns.inet.inet_ntop(af, dns.inet.inet_pton(af, a)), a)
 
     def test_isaddress(self):
-        for (t, e) in [
+        for t, e in [
             ("1.2.3.4", True),
             ("2001:db8:0:1:1:1:1:1", True),
             ("hello world", False),
index f9b9d42882e92fd33b5746fd5ef374e28b39f910..7f41f3409258ba42e2141187d9cd4d29f2ce2afd 100644 (file)
@@ -330,7 +330,7 @@ class AXFRNanoNameserver(Server):
         response = dns.message.make_response(request.message)
         response.question = []
         response.flags |= dns.flags.AA
-        for (name, rdataset) in self.zone.iterate_rdatasets():
+        for name, rdataset in self.zone.iterate_rdatasets():
             if rdataset.rdtype == dns.rdatatype.SOA and name == dns.name.empty:
                 continue
             rrset = dns.rrset.RRset(
index eeb9279f406b95f5a42414213bab2507ae7e7ffa..a96dd8fb1f8a6da307c68c618155acf5249bb300 100644 (file)
@@ -22,7 +22,6 @@ import dns.rdatatype
 
 
 class RdTypeAndClassTestCase(unittest.TestCase):
-
     # Classes
 
     def test_class_meta1(self):
index 6b9e2b5eb2418034c6c34ea69ac239960f2dc1e5..78736567e6207185aafec3d6f59dd661f6c3a22e 100644 (file)
@@ -305,7 +305,7 @@ def make_xfr(zone):
         soa_name = zone.origin
     soa = zone.find_rdataset(soa_name, "SOA")
     add_rdataset(msg, soa_name, soa)
-    for (name, rds) in zone.iterate_rdatasets():
+    for name, rds in zone.iterate_rdatasets():
         if rds.rdtype == dns.rdatatype.SOA:
             continue
         add_rdataset(msg, name, rds)