From c9ceb191e8e45c461b8f03e853bef0d9f0eb403f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 21 May 2026 11:52:56 +0200 Subject: [PATCH] Remove workarounds for dnspython < 2.7.0 dnspython 2.7.0 is now required to run the BIND 9 system test suite. Drop the workarounds for older dnspython versions as they are now redundant. --- bin/tests/system/cookie/cookie_ans.py | 8 ++------ bin/tests/system/resend_loop/ans3/ans.py | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bin/tests/system/cookie/cookie_ans.py b/bin/tests/system/cookie/cookie_ans.py index 3b6f0406f2..59f3d1fdf5 100644 --- a/bin/tests/system/cookie/cookie_ans.py +++ b/bin/tests/system/cookie/cookie_ans.py @@ -44,12 +44,8 @@ def _add_cookie(qctx: QueryContext) -> None: for o in qctx.query.options: if o.otype == dns.edns.OptionType.COOKIE: cookie = o - try: - if len(cookie.server) == 0: - cookie.server = cookie.client - except AttributeError: # dnspython<2.7.0 compat - if len(o.data) == 8: - cookie.data *= 2 + if len(cookie.server) == 0: + cookie.server = cookie.client qctx.response.use_edns(options=[cookie]) return diff --git a/bin/tests/system/resend_loop/ans3/ans.py b/bin/tests/system/resend_loop/ans3/ans.py index 47275bf377..2b8cf4d018 100644 --- a/bin/tests/system/resend_loop/ans3/ans.py +++ b/bin/tests/system/resend_loop/ans3/ans.py @@ -32,12 +32,8 @@ def _get_cookie(qctx: QueryContext): for o in qctx.query.options: if o.otype == dns.edns.OptionType.COOKIE: cookie = o - try: - if len(cookie.server) == 0: - cookie.server = b"\x11\x22\x33\x44\x55\x66\x77\x88" - except AttributeError: # dnspython<2.7.0 compat - if len(o.data) == 8: - cookie.data *= 2 + if len(cookie.server) == 0: + cookie.server = b"\x11\x22\x33\x44\x55\x66\x77\x88" return cookie