From: Nicki Křížek <nicki@isc.org>
Date: Tue, 30 Dec 2025 13:29:51 +0000 (+0100)
Subject: Remove compatibility hacks for dnspython<2.7.0
X-Git-Tag: v9.18.45~8^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00b21e55fa5172281fee9870644c3ca92163cfc4;p=thirdparty%2Fbind9.git

Remove compatibility hacks for dnspython<2.7.0

The minimum required dnspython version is now 2.7.0 and those
compatibility hacks can be dropped.

(cherry picked from commit ce385d8100b9dfc14b6233453ea7dbcf0db56b3b)
---

diff --git a/bin/tests/system/bailiwick/tests_bailiwick.py b/bin/tests/system/bailiwick/tests_bailiwick.py
index d0313346d4d..76540008db0 100644
--- a/bin/tests/system/bailiwick/tests_bailiwick.py
+++ b/bin/tests/system/bailiwick/tests_bailiwick.py
@@ -17,9 +17,6 @@ import dns.message
 
 import pytest
 
-# isctest.asyncserver requires dnspython >= 2.0.0
-pytest.importorskip("dns", minversion="2.0.0")
-
 import isctest
 from isctest.instance import NamedInstance
 
diff --git a/bin/tests/system/checkds/tests_checkds.py b/bin/tests/system/checkds/tests_checkds.py
index 8e6660a6ef2..50dc2c0222c 100755
--- a/bin/tests/system/checkds/tests_checkds.py
+++ b/bin/tests/system/checkds/tests_checkds.py
@@ -21,7 +21,6 @@ import time
 import isctest
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
 import dns.exception
 import dns.message
 import dns.name
diff --git a/bin/tests/system/dispatch/tests_connreset.py b/bin/tests/system/dispatch/tests_connreset.py
index 0b78fb8e0a6..01a1bbc5c09 100644
--- a/bin/tests/system/dispatch/tests_connreset.py
+++ b/bin/tests/system/dispatch/tests_connreset.py
@@ -14,7 +14,6 @@
 import pytest
 import isctest
 
-pytest.importorskip("dns")
 import dns.message
 
 pytestmark = pytest.mark.extra_artifacts(
diff --git a/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py b/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
index c028b5259b9..05545c1ef40 100644
--- a/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
+++ b/bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py
@@ -16,9 +16,6 @@ import os
 import pytest
 
 pytest.importorskip("cryptography")
-pytest.importorskip(
-    "dns", minversion="2.7.0"
-)  # dns.dnssec.sign_zone(deterministic=...) needed
 
 from cryptography.hazmat.primitives.asymmetric import ec
 
diff --git a/bin/tests/system/dnstap/tests_dnstap.py b/bin/tests/system/dnstap/tests_dnstap.py
index 3c179c28250..bd254a1a86a 100644
--- a/bin/tests/system/dnstap/tests_dnstap.py
+++ b/bin/tests/system/dnstap/tests_dnstap.py
@@ -17,7 +17,6 @@ import re
 import isctest
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
 import dns.rrset
 
 pytestmark = pytest.mark.extra_artifacts(
diff --git a/bin/tests/system/doth/tests_gnutls.py b/bin/tests/system/doth/tests_gnutls.py
index 9c897714efe..42ef3f6973e 100644
--- a/bin/tests/system/doth/tests_gnutls.py
+++ b/bin/tests/system/doth/tests_gnutls.py
@@ -18,7 +18,7 @@ import time
 
 import pytest
 
-pytest.importorskip("dns")
+import dns
 import dns.exception
 import dns.name
 import dns.rdataclass
diff --git a/bin/tests/system/glue/tests_glue.py b/bin/tests/system/glue/tests_glue.py
index faf251367da..612e6bef996 100644
--- a/bin/tests/system/glue/tests_glue.py
+++ b/bin/tests/system/glue/tests_glue.py
@@ -12,12 +12,9 @@
 
 import dns.flags
 import dns.message
-import pytest
 
 import isctest
 
-pytest.importorskip("dns", minversion="2.0.0")
-
 
 def test_glue_full_glue_set():
     """test that a ccTLD referral gets a full glue set from the root zone"""
diff --git a/bin/tests/system/isctest/asyncserver.py b/bin/tests/system/isctest/asyncserver.py
index d2b22d7c129..eeca1b88ece 100644
--- a/bin/tests/system/isctest/asyncserver.py
+++ b/bin/tests/system/isctest/asyncserver.py
@@ -113,7 +113,6 @@ class AsyncServer:
         tcp_handler: Optional[_TcpHandler],
         pidfile: Optional[str] = None,
     ) -> None:
-        self._abort_if_on_dnspython_version_less_than_2_0_0()
         logging.basicConfig(
             format="%(asctime)s %(levelname)8s  %(message)s",
             level=os.environ.get("ANS_LOG_LEVEL", "INFO").upper(),
@@ -141,14 +140,6 @@ class AsyncServer:
         self._pidfile: Optional[str] = pidfile
         self._work_done: Optional[asyncio.Future] = None
 
-    @classmethod
-    def _abort_if_on_dnspython_version_less_than_2_0_0(cls) -> None:
-        if dns.version.MAJOR < 2:
-            error = f"Using {cls.__name__} requires dnspython >= 2.0.0; "
-            error += 'add `pytest.importorskip("dns", minversion="2.0.0")` '
-            error += "to the test module to skip this test."
-            raise RuntimeError(error)
-
     def _get_ipv4_address_from_directory_name(self) -> str:
         containing_directory = pathlib.Path().absolute().stem
         match_result = re.match(r"ans(?P<index>\d+)", containing_directory)
diff --git a/bin/tests/system/isctest/check.py b/bin/tests/system/isctest/check.py
index e7187b88533..0a3b199ea40 100644
--- a/bin/tests/system/isctest/check.py
+++ b/bin/tests/system/isctest/check.py
@@ -13,13 +13,13 @@ import shutil
 from typing import cast, List, Optional
 
 import dns.edns
+from dns.edns import EDECode, EDEOption
 import dns.flags
 import dns.message
 import dns.rcode
 import dns.zone
 
 import isctest.log
-from isctest.compat import dns_rcode, EDECode, EDEOption
 
 
 def rcode(message: dns.message.Message, expected_rcode) -> None:
@@ -27,19 +27,19 @@ def rcode(message: dns.message.Message, expected_rcode) -> None:
 
 
 def noerror(message: dns.message.Message) -> None:
-    rcode(message, dns_rcode.NOERROR)
+    rcode(message, dns.rcode.NOERROR)
 
 
 def notimp(message: dns.message.Message) -> None:
-    rcode(message, dns_rcode.NOTIMP)
+    rcode(message, dns.rcode.NOTIMP)
 
 
 def refused(message: dns.message.Message) -> None:
-    rcode(message, dns_rcode.REFUSED)
+    rcode(message, dns.rcode.REFUSED)
 
 
 def servfail(message: dns.message.Message) -> None:
-    rcode(message, dns_rcode.SERVFAIL)
+    rcode(message, dns.rcode.SERVFAIL)
 
 
 def adflag(message: dns.message.Message) -> None:
@@ -82,10 +82,6 @@ def _extract_ede_options(
 
 def noede(message: dns.message.Message) -> None:
     """Check that message contains no EDE option."""
-    if not hasattr(dns.edns, "EDECode"):
-        # dnspython<2.2.0 doesn't support EDE, skip check
-        return
-
     ede_options = _extract_ede_options(message)
     assert not ede_options, f"unexpected EDE options {ede_options} in {message}"
 
@@ -94,10 +90,6 @@ def ede(
     message: dns.message.Message, code: EDECode, text: Optional[str] = None
 ) -> None:
     """Check if message contains expected EDE code (and its text)."""
-    if not hasattr(dns.edns, "EDECode"):
-        # dnspython<2.2.0 doesn't support EDE, skip check
-        return
-
     msg_opts = _extract_ede_options(message)
     matching_opts = [opt for opt in msg_opts if opt.code == code]
 
@@ -204,7 +196,7 @@ def is_executable(cmd: str, errmsg: str) -> None:
 def named_alive(named_proc, resolver_ip):
     assert named_proc.poll() is None, "named isn't running"
     msg = isctest.query.create("version.bind", "TXT", "CH")
-    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)
+    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns.rcode.NOERROR)
 
 
 def notauth(message: dns.message.Message) -> None:
diff --git a/bin/tests/system/isctest/compat.py b/bin/tests/system/isctest/compat.py
deleted file mode 100644
index 3dc5810745a..00000000000
--- a/bin/tests/system/isctest/compat.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# SPDX-License-Identifier: MPL-2.0
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0.  If a copy of the MPL was not distributed with this
-# file, you can obtain one at https://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-from typing import Any, TYPE_CHECKING
-
-import dns.edns
-import dns.rcode
-
-# compatiblity with dnspython<2.0.0
-try:
-    # In dnspython>=2.0.0, dns.rcode.Rcode class is available
-    # pylint: disable=invalid-name
-    dns_rcode = dns.rcode.Rcode  # type: Any
-except AttributeError:
-    # In dnspython<2.0.0, selected rcodes are available as integers directly
-    # from dns.rcode
-    dns_rcode = dns.rcode
-
-
-if TYPE_CHECKING:
-    EDECode = dns.edns.EDECode
-    EDEOption = dns.edns.EDEOption
-else:
-    try:  # compatiblity with dnspython<2.2.0
-        EDECode = dns.edns.EDECode
-    except AttributeError:
-        # In dnspython<2.2.0, the dns.edns.EDECode doesn't exist.
-        #
-        # The primary use-case is for us to use existing EDECode objects from the
-        # class, e.g. EDECode.FILTERED. To mimick this behavior, use a string
-        # factory that just turns the attribute name into a string.
-        #
-        # The used compatibility hack doesn't really matter (as long as EDECode.xxx
-        # doesn't raise exception), as with dnspython versions prior to 2.2.0, any
-        # EDE checking will be skipped anyway.
-        class _CompatEDECode:
-            def __getattr__(self, name: str) -> str:
-                return name
-
-        EDECode = _CompatEDECode()
-    try:
-        EDEOption = dns.edns.EDEOption
-    except AttributeError:
-        # In dnspython<2.2.0, the dns.edns.EDEOption doesn't exist, so we stub it to be
-        # able to use it in type annotations.
-        class EDEOption:
-            def __new__(cls, *args, **kwargs):
-                raise RuntimeError("Using EDEOption requires dnspython>=2.2.0")
diff --git a/bin/tests/system/isctest/hypothesis/strategies.py b/bin/tests/system/isctest/hypothesis/strategies.py
index a3f9eac2b27..e8badc6802b 100644
--- a/bin/tests/system/isctest/hypothesis/strategies.py
+++ b/bin/tests/system/isctest/hypothesis/strategies.py
@@ -143,13 +143,8 @@ def dns_names(
 
 
 RDATACLASS_MAX = RDATATYPE_MAX = 65535
-try:
-    dns_rdataclasses = builds(dns.rdataclass.RdataClass, integers(0, RDATACLASS_MAX))
-    dns_rdatatypes = builds(dns.rdatatype.RdataType, integers(0, RDATATYPE_MAX))
-except AttributeError:
-    # In old dnspython versions, RDataTypes and RDataClasses are int and not enums.
-    dns_rdataclasses = integers(0, RDATACLASS_MAX)  # type: ignore
-    dns_rdatatypes = integers(0, RDATATYPE_MAX)  # type: ignore
+dns_rdataclasses = builds(dns.rdataclass.RdataClass, integers(0, RDATACLASS_MAX))
+dns_rdatatypes = builds(dns.rdatatype.RdataType, integers(0, RDATATYPE_MAX))
 dns_rdataclasses_without_meta = dns_rdataclasses.filter(dns.rdataclass.is_metaclass)
 
 # NOTE: This should really be `dns_rdatatypes_without_meta = dns_rdatatypes_without_meta.filter(dns.rdatatype.is_metatype()`,
diff --git a/bin/tests/system/isctest/name.py b/bin/tests/system/isctest/name.py
index 7cf3e8d696c..374eb8ba60f 100644
--- a/bin/tests/system/isctest/name.py
+++ b/bin/tests/system/isctest/name.py
@@ -11,9 +11,6 @@
 
 from typing import Container, Iterable, FrozenSet
 
-import pytest
-
-pytest.importorskip("dns", minversion="2.3.0")  # NameRelation
 from dns.name import Name, NameRelation
 import dns.zone
 import dns.rdatatype
diff --git a/bin/tests/system/isctest/query.py b/bin/tests/system/isctest/query.py
index b11b165f856..f0c782c1cbd 100644
--- a/bin/tests/system/isctest/query.py
+++ b/bin/tests/system/isctest/query.py
@@ -17,7 +17,6 @@ import dns.query
 import dns.message
 
 import isctest.log
-from isctest.compat import dns_rcode
 
 QUERY_TIMEOUT = 10
 
@@ -30,7 +29,7 @@ def generic_query(
     source: Optional[str] = None,
     timeout: int = QUERY_TIMEOUT,
     attempts: int = 10,
-    expected_rcode: dns_rcode = None,
+    expected_rcode: Optional[dns.rcode.Rcode] = None,
     log_query: bool = True,
     log_response: bool = True,
 ) -> Any:
@@ -61,9 +60,9 @@ def generic_query(
                 return res
         time.sleep(1)
     if expected_rcode is not None:
-        last_rcode = dns_rcode.to_text(res.rcode()) if res else None
+        last_rcode = dns.rcode.to_text(res.rcode()) if res else None
         isctest.log.debug(
-            f"isc.query.{query_func.__name__}(): expected rcode={dns_rcode.to_text(expected_rcode)}, last rcode={last_rcode}"
+            f"isc.query.{query_func.__name__}(): expected rcode={dns.rcode.to_text(expected_rcode)}, last rcode={last_rcode}"
         )
     raise dns.exception.Timeout
 
diff --git a/bin/tests/system/isctest/run.py b/bin/tests/system/isctest/run.py
index 3fbc6ac3411..6bc77672c70 100644
--- a/bin/tests/system/isctest/run.py
+++ b/bin/tests/system/isctest/run.py
@@ -16,9 +16,9 @@ from typing import Optional
 
 import isctest.log
 import isctest.text
-from isctest.compat import dns_rcode
 
 import dns.message
+import dns.rcode
 
 
 class CmdResult:
@@ -149,4 +149,4 @@ def get_custom_named_instance(assumed_ns, ports):
 def assert_custom_named_is_alive(named_proc, resolver_ip):
     assert named_proc.poll() is None, "named isn't running"
     msg = dns.message.make_query("version.bind", "TXT", "CH")
-    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)
+    isctest.query.tcp(msg, resolver_ip, expected_rcode=dns.rcode.NOERROR)
diff --git a/bin/tests/system/limits/tests_limits.py b/bin/tests/system/limits/tests_limits.py
index ca7214a9de4..6949838ec74 100644
--- a/bin/tests/system/limits/tests_limits.py
+++ b/bin/tests/system/limits/tests_limits.py
@@ -14,9 +14,6 @@ import itertools
 import isctest
 import pytest
 
-# Everything from getting a big answer to creating an RR set with thousands
-# of records takes minutes of CPU and real time with dnspython < 2.0.0.
-pytest.importorskip("dns", minversion="2.0.0")
 import dns.rrset
 
 
diff --git a/bin/tests/system/names/tests_names.py b/bin/tests/system/names/tests_names.py
index b72fcbec980..38fc983d089 100644
--- a/bin/tests/system/names/tests_names.py
+++ b/bin/tests/system/names/tests_names.py
@@ -9,10 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import pytest
-
-pytest.importorskip("dns", minversion="2.7.0")
-
 import isctest
 
 
diff --git a/bin/tests/system/nsec3-answer/tests_nsec3.py b/bin/tests/system/nsec3-answer/tests_nsec3.py
index 2ee8a4fa494..da74a599ffd 100755
--- a/bin/tests/system/nsec3-answer/tests_nsec3.py
+++ b/bin/tests/system/nsec3-answer/tests_nsec3.py
@@ -18,7 +18,6 @@ from typing import Optional, Set, Tuple
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.5.0")
 import dns.dnssec
 import dns.message
 import dns.name
diff --git a/bin/tests/system/optout/tests_optout.py b/bin/tests/system/optout/tests_optout.py
index 08114af5119..ce5071ffa79 100755
--- a/bin/tests/system/optout/tests_optout.py
+++ b/bin/tests/system/optout/tests_optout.py
@@ -19,7 +19,7 @@ import sys
 import isctest
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.exception
 import dns.message
 import dns.name
diff --git a/bin/tests/system/rpzextra/tests_rpzextra.py b/bin/tests/system/rpzextra/tests_rpzextra.py
index e918fa832e2..e6a83249424 100644
--- a/bin/tests/system/rpzextra/tests_rpzextra.py
+++ b/bin/tests/system/rpzextra/tests_rpzextra.py
@@ -15,12 +15,11 @@ import os
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.rcode
 import dns.rrset
 
 import isctest
-from isctest.compat import dns_rcode
 
 
 pytestmark = pytest.mark.extra_artifacts(
@@ -78,13 +77,13 @@ def test_rpz_multiple_views(qname, source, rcode):
         msg,
         ip="10.53.0.3",
         source="10.53.0.2",
-        expected_rcode=dns_rcode.NOERROR,
+        expected_rcode=dns.rcode.NOERROR,
     )
     isctest.query.tcp(
         msg,
         ip="10.53.0.3",
         source="10.53.0.5",
-        expected_rcode=dns_rcode.NOERROR,
+        expected_rcode=dns.rcode.NOERROR,
     )
 
     msg = isctest.query.create(qname, "A")
diff --git a/bin/tests/system/shutdown/tests_shutdown.py b/bin/tests/system/shutdown/tests_shutdown.py
index 52e574543e2..71f6826bf54 100755
--- a/bin/tests/system/shutdown/tests_shutdown.py
+++ b/bin/tests/system/shutdown/tests_shutdown.py
@@ -21,7 +21,7 @@ import time
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.exception
 
 import isctest
diff --git a/bin/tests/system/statschannel/tests_json.py b/bin/tests/system/statschannel/tests_json.py
index 105e10d445f..9e9a2dc405f 100755
--- a/bin/tests/system/statschannel/tests_json.py
+++ b/bin/tests/system/statschannel/tests_json.py
@@ -14,13 +14,13 @@
 from datetime import datetime
 
 import pytest
+import requests
 
 import isctest.mark
 
 pytest.register_assert_rewrite("generic")
 import generic
 
-requests = pytest.importorskip("requests")
 
 pytestmark = [
     isctest.mark.have_json_c,
diff --git a/bin/tests/system/statschannel/tests_xml.py b/bin/tests/system/statschannel/tests_xml.py
index 94c0cc1fcc9..d41fc4fc766 100755
--- a/bin/tests/system/statschannel/tests_xml.py
+++ b/bin/tests/system/statschannel/tests_xml.py
@@ -15,13 +15,13 @@ from datetime import datetime
 import xml.etree.ElementTree as ET
 
 import pytest
+import requests
 
 import isctest.mark
 
 pytest.register_assert_rewrite("generic")
 import generic
 
-requests = pytest.importorskip("requests")
 
 pytestmark = [
     isctest.mark.have_libxml2,
diff --git a/bin/tests/system/tcp/tests_tcp.py b/bin/tests/system/tcp/tests_tcp.py
index 8e235596c78..399eaf20495 100644
--- a/bin/tests/system/tcp/tests_tcp.py
+++ b/bin/tests/system/tcp/tests_tcp.py
@@ -19,7 +19,7 @@ import time
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.message
 import dns.query
 
diff --git a/bin/tests/system/timeouts/tests_tcp_timeouts.py b/bin/tests/system/timeouts/tests_tcp_timeouts.py
index cb8defa71ef..e25bba5a042 100644
--- a/bin/tests/system/timeouts/tests_tcp_timeouts.py
+++ b/bin/tests/system/timeouts/tests_tcp_timeouts.py
@@ -18,7 +18,7 @@ import time
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.edns
 import dns.message
 import dns.name
diff --git a/bin/tests/system/tsig/tests_tsig_hypothesis.py b/bin/tests/system/tsig/tests_tsig_hypothesis.py
index 9ea5b426434..3a1c05d1d11 100644
--- a/bin/tests/system/tsig/tests_tsig_hypothesis.py
+++ b/bin/tests/system/tsig/tests_tsig_hypothesis.py
@@ -15,8 +15,6 @@ import time
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.7.0")  # TSIG parsing without validation
-
 import dns.exception
 import dns.message
 import dns.name
diff --git a/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py b/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
index 38b424d4c59..7e960ba6e1c 100755
--- a/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
+++ b/bin/tests/system/tsiggss/tests_isc_spnego_flaws.py
@@ -24,7 +24,7 @@ import pytest
 
 import isctest
 
-pytest.importorskip("dns")
+import dns
 import dns.message
 import dns.name
 import dns.rdata
diff --git a/bin/tests/system/wildcard/tests_wildcard.py b/bin/tests/system/wildcard/tests_wildcard.py
index 459e3397b35..b086fc0d136 100755
--- a/bin/tests/system/wildcard/tests_wildcard.py
+++ b/bin/tests/system/wildcard/tests_wildcard.py
@@ -29,7 +29,7 @@ Limitations - untested properties:
 
 import pytest
 
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
 import dns.message
 import dns.name
 import dns.query