Remove dnspython<2.0.0 compatibility hacks from custom servers

isctest.asyncserver requires dnspython 2+ now.

diff --git a/bin/tests/system/chain/ans3/ans.py b/bin/tests/system/chain/ans3/ans.py
index 299f04235441f4cf7d20062313854ec604c4d3e0..b61cd9d79a5dc13b62f03db638902282c8f0a3fd 100755 (executable)
--- a/bin/tests/system/chain/ans3/ans.py
+++ b/bin/tests/system/chain/ans3/ans.py
@@ -31,7 +31,7 @@ from isctest.asyncserver import (
 try:
     dns_namerelation_equal = dns.name.NameRelation.EQUAL
     dns_namerelation_subdomain = dns.name.NameRelation.SUBDOMAIN
-except AttributeError:  # dnspython < 2.0.0 compat
+except AttributeError:  # dnspython < 2.3.0 compat
     dns_namerelation_equal = dns.name.NAMERELN_EQUAL  # type: ignore
     dns_namerelation_subdomain = dns.name.NAMERELN_SUBDOMAIN  # type: ignore
 

diff --git a/bin/tests/system/chain/ans4/ans.py b/bin/tests/system/chain/ans4/ans.py
index f175a88c1e0ba48c7637829cf7fd9dd18c1c38fe..2f0d8c3352ee7aef1761cb735487be3bced24ef4 100755 (executable)
--- a/bin/tests/system/chain/ans4/ans.py
+++ b/bin/tests/system/chain/ans4/ans.py
@@ -34,11 +34,6 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-try:
-    RdataType = dns.rdatatype.RdataType
-except AttributeError:  # dnspython < 2.0.0 compat
-    RdataType = int  # type: ignore
-
 
 class ChainNameGenerator:
     """
@@ -105,13 +100,13 @@ class RecordGenerator(abc.ABC):
 
     @classmethod
     def create_rrset(
-        cls, owner: dns.name.Name, rrtype: RdataType, rdata: str
+        cls, owner: dns.name.Name, rrtype: dns.rdatatype.RdataType, rdata: str
     ) -> dns.rrset.RRset:
         return dns.rrset.from_text(owner, 86400, dns.rdataclass.IN, rrtype, rdata)
 
     @classmethod
     def create_rrset_signature(
-        cls, owner: dns.name.Name, rrtype: RdataType
+        cls, owner: dns.name.Name, rrtype: dns.rdatatype.RdataType
     ) -> dns.rrset.RRset:
         covers = dns.rdatatype.to_text(rrtype)
         ttl = "86400"

diff --git a/bin/tests/system/isctest/asyncserver.py b/bin/tests/system/isctest/asyncserver.py
index cd7d7027c7e474f7b9ea91d7ab1b7c8461d738bc..dfaf125709f9e4c60551a71521bb43b934a66305 100644 (file)
--- a/bin/tests/system/isctest/asyncserver.py
+++ b/bin/tests/system/isctest/asyncserver.py
@@ -53,13 +53,6 @@ import dns.tsig
 import dns.version
 import dns.zone
 
-try:
-    RdataType = dns.rdatatype.RdataType
-    RdataClass = dns.rdataclass.RdataClass
-except AttributeError:  # dnspython < 2.0.0 compat
-    RdataType = int  # type: ignore
-    RdataClass = int  # type: ignore
-
 
 _UdpHandler = Callable[
     [bytes, Tuple[str, int], asyncio.DatagramTransport], Coroutine[Any, Any, None]
@@ -291,11 +284,11 @@ class QueryContext:
         return self.alias or self.qname
 
     @property
-    def qclass(self) -> RdataClass:
+    def qclass(self) -> dns.rdataclass.RdataClass:
         return self.query.question[0].rdclass
 
     @property
-    def qtype(self) -> RdataType:
+    def qtype(self) -> dns.rdatatype.RdataType:
         return self.query.question[0].rdtype
 
 

diff --git a/bin/tests/system/qmin/qmin_ans.py b/bin/tests/system/qmin/qmin_ans.py
index b78e723ecba07331ecbc3b2fb9633e4b821195bf..6185e15a1090477f552a06b1c4af08389ec6c089 100644 (file)
--- a/bin/tests/system/qmin/qmin_ans.py
+++ b/bin/tests/system/qmin/qmin_ans.py
@@ -25,8 +25,6 @@ from isctest.asyncserver import (
     ResponseAction,
 )
 
-from isctest.compat import dns_rcode
-
 
 def log_query(qctx: QueryContext) -> None:
     """
@@ -66,7 +64,7 @@ class EntRcodeChanger(DomainHandler):
 
     @property
     @abc.abstractmethod
-    def rcode(self) -> dns_rcode:
+    def rcode(self) -> dns.rcode.Rcode:
         raise NotImplementedError
 
     async def get_responses(