]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
lint
authorBob Halley <halley@dnspython.org>
Sun, 12 Mar 2023 15:06:46 +0000 (08:06 -0700)
committerBob Halley <halley@dnspython.org>
Sun, 12 Mar 2023 15:06:46 +0000 (08:06 -0700)
dns/resolver.py

index 2675b49900b36b2af91b26c5604dccd9d4ed8161..cd041d9250f05d4a1aa067640dbfb4facd2ae4d2 100644 (file)
@@ -312,7 +312,7 @@ class Answer:
 
 class Answers(dict):
     """A dict of DNS stub resolver answers, indexed by type."""
-    pass
+
 
 class HostAnswers(Answers):
     """A dict of DNS stub resolver answers to a host name lookup, indexed by
@@ -321,11 +321,11 @@ class HostAnswers(Answers):
 
     @classmethod
     def make(
-        self,
-        v6 : Optional[Answer] = None,
-        v4 : Optional[Answer] = None,
-        add_empty : bool = True
-    ) -> 'HostAnswers':
+        cls,
+        v6: Optional[Answer] = None,
+        v4: Optional[Answer] = None,
+        add_empty: bool = True,
+    ) -> "HostAnswers":
         answers = HostAnswers()
         if v6 is not None and (add_empty or v6.rrset):
             answers[dns.rdatatype.AAAA] = v6
@@ -333,12 +333,10 @@ class HostAnswers(Answers):
             answers[dns.rdatatype.A] = v4
         return answers
 
-
     # Returns pairs of (address, family) from this result, potentiallys
     # filtering by address family.
     def addresses_and_families(
-        self,
-        family : int = socket.AF_UNSPEC
+        self, family: int = socket.AF_UNSPEC
     ) -> Iterator[Tuple[str, int]]:
         if family == socket.AF_UNSPEC:
             yield from self.addresses_and_families(socket.AF_INET6)
@@ -356,7 +354,7 @@ class HostAnswers(Answers):
 
     # Returns addresses from this result, potentially filtering by
     # address family.
-    def addresses(self, family : int = socket.AF_UNSPEC) -> Iterator[str]:
+    def addresses(self, family: int = socket.AF_UNSPEC) -> Iterator[str]:
         return (pair[0] for pair in self.addresses_and_families(family))
 
     # Returns the canonical name from this result.
@@ -1402,7 +1400,7 @@ class Resolver(BaseResolver):
         self,
         name: Union[dns.name.Name, str],
         family: int = socket.AF_UNSPEC,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> HostAnswers:
         """Use a resolver to query for address records.
 
@@ -1435,29 +1433,34 @@ class 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 = self.resolve(name, dns.rdatatype.AAAA,
-                          raise_on_no_answer=False,
-                          lifetime=self._compute_timeout(start, lifetime),
-                          **modified_kwargs)
+        v6 = 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 = self.resolve(name, dns.rdatatype.A,
-                          raise_on_no_answer=False,
-                          lifetime=self._compute_timeout(start, lifetime),
-                          **modified_kwargs)
+        v4 = self.resolve(
+            name,
+            dns.rdatatype.A,
+            raise_on_no_answer=False,
+            lifetime=self._compute_timeout(start, lifetime),
+            **modified_kwargs,
+        )
         answers = HostAnswers.make(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
 
     def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
@@ -1584,9 +1587,7 @@ def resolve_address(ipaddr: str, *args: Any, **kwargs: Any) -> Answer:
 
 
 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
 ) -> HostAnswers:
     """Use a resolver to query for address records.