dnspython 2.8.0rc1__tar.gz → 2.9.0__tar.gz

{dnspython-2.8.0rc1 → dnspython-2.9.0}/PKG-INFO

@@ -1,57 +1,55 @@
 Metadata-Version: 2.4
 Name: dnspython
-Version: 2.8.0rc1
+Version: 2.9.0
 Summary: DNS toolkit
-Project-URL: homepage, https://www.dnspython.org
-Project-URL: repository, https://github.com/rthalley/dnspython.git
-Project-URL: documentation, https://dnspython.readthedocs.io/en/stable/
-Project-URL: issues, https://github.com/rthalley/dnspython/issues
+Author: Bob Halley
 Author-email: Bob Halley <halley@dnspython.org>
-License: ISC
-License-File: LICENSE
+License-Expression: ISC
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: ISC License (ISCL)
-Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
+Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
+Classifier: Topic :: Internet :: Name Service (DNS)
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Internet :: Name Service (DNS)
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.10
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: black>=26.5 ; extra == 'dev'
+Requires-Dist: coverage>=7.15 ; extra == 'dev'
+Requires-Dist: hypercorn>=0.18.0 ; extra == 'dev'
+Requires-Dist: pyright>=1.1.411 ; extra == 'dev'
+Requires-Dist: pytest>=9.1 ; extra == 'dev'
+Requires-Dist: pytest-cov>=7.1 ; extra == 'dev'
+Requires-Dist: quart-trio>=0.12.0 ; extra == 'dev'
+Requires-Dist: ruff>=0.16.0 ; extra == 'dev'
+Requires-Dist: sphinx>=9.1.0 ; python_full_version >= '3.12' and extra == 'dev'
+Requires-Dist: sphinx-rtd-theme>=3.1.0 ; python_full_version >= '3.12' and extra == 'dev'
+Requires-Dist: trustme>=1.2.1 ; extra == 'dev'
+Requires-Dist: ty>=0.0.85 ; extra == 'dev'
+Requires-Dist: cryptography>=50 ; extra == 'dnssec'
+Requires-Dist: httpcore2>=2.13 ; extra == 'doh'
+Requires-Dist: httpx2>=2.13 ; extra == 'doh'
+Requires-Dist: h2>=4.4 ; extra == 'doh'
+Requires-Dist: aioquic>=1.3.0 ; extra == 'doq'
+Requires-Dist: idna>=3.20 ; extra == 'idna'
+Requires-Dist: trio>=0.34 ; extra == 'trio'
+Requires-Dist: wmi>=1.5.1 ; sys_platform == 'win32' and extra == 'wmi'
+Requires-Python: >=3.11
+Project-URL: homepage, https://www.dnspython.org
+Project-URL: repository, https://github.com/rthalley/dnspython.git
+Project-URL: documentation, https://dnspython.readthedocs.io/en/stable/
+Project-URL: issues, https://github.com/rthalley/dnspython/issues
 Provides-Extra: dev
-Requires-Dist: black>=25.1.0; extra == 'dev'
-Requires-Dist: coverage>=7.0; extra == 'dev'
-Requires-Dist: flake8>=7; extra == 'dev'
-Requires-Dist: hypercorn>=0.17.0; extra == 'dev'
-Requires-Dist: mypy>=1.17; extra == 'dev'
-Requires-Dist: pylint>=3; extra == 'dev'
-Requires-Dist: pytest-cov>=6.2.0; extra == 'dev'
-Requires-Dist: pytest>=8.4; extra == 'dev'
-Requires-Dist: quart-trio>=0.12.0; extra == 'dev'
-Requires-Dist: sphinx-rtd-theme>=3.0.0; extra == 'dev'
-Requires-Dist: sphinx>=8.2.0; extra == 'dev'
-Requires-Dist: twine>=6.1.0; extra == 'dev'
-Requires-Dist: wheel>=0.45.0; extra == 'dev'
 Provides-Extra: dnssec
-Requires-Dist: cryptography>=45; extra == 'dnssec'
 Provides-Extra: doh
-Requires-Dist: h2>=4.2.0; extra == 'doh'
-Requires-Dist: httpcore>=1.0.0; extra == 'doh'
-Requires-Dist: httpx>=0.28.0; extra == 'doh'
 Provides-Extra: doq
-Requires-Dist: aioquic>=1.2.0; extra == 'doq'
 Provides-Extra: idna
-Requires-Dist: idna>=3.10; extra == 'idna'
 Provides-Extra: trio
-Requires-Dist: trio>=0.30; extra == 'trio'
 Provides-Extra: wmi
-Requires-Dist: wmi>=1.5.1; (platform_system == 'Windows') and extra == 'wmi'
 Description-Content-Type: text/markdown
 
 # dnspython
@@ -73,8 +71,8 @@ classes perform queries for data of a given name, type, and class, and return an
 answer set. The low-level classes allow direct manipulation of DNS zones,
 messages, names, and records.
 
-To see a few of the ways `dnspython` can be used, look in the `examples/`
-directory.
+The module name for `dnspython` is `dns`.  To see a few of the ways `dnspython` can be
+used, look in the `examples/` directory.
 
 `dnspython` is a utility to work with DNS, `/etc/hosts` is thus not used. For
 simple forward DNS lookups, it's better to use `socket.getaddrinfo()` or
@@ -85,9 +83,9 @@ testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is of `dnspython` 2.8.0rc1.
+This is `dnspython` 2.9.0.
 Please read
-[What's New](https://dnspython.readthedocs.io/en/latest/whatsnew.html) for
+[What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.
 
 ## INSTALLATION
@@ -142,7 +140,7 @@ Note that you can install any combination of the above, e.g.:
 
 ### Notices
 
-Python 2.x support ended with the release of 1.16.0.  `dnspython` supports Python 3.10
+Python 2.x support ended with the release of 1.16.0.  `dnspython` supports Python 3.11
 and later.  Future support  is aligned with the lifetime of the Python 3 versions.
 
 Documentation has moved to

{dnspython-2.8.0rc1 → dnspython-2.9.0}/README.md

@@ -17,8 +17,8 @@ classes perform queries for data of a given name, type, and class, and return an
 answer set. The low-level classes allow direct manipulation of DNS zones,
 messages, names, and records.
 
-To see a few of the ways `dnspython` can be used, look in the `examples/`
-directory.
+The module name for `dnspython` is `dns`.  To see a few of the ways `dnspython` can be
+used, look in the `examples/` directory.
 
 `dnspython` is a utility to work with DNS, `/etc/hosts` is thus not used. For
 simple forward DNS lookups, it's better to use `socket.getaddrinfo()` or
@@ -29,9 +29,9 @@ testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is of `dnspython` 2.8.0rc1.
+This is `dnspython` 2.9.0.
 Please read
-[What's New](https://dnspython.readthedocs.io/en/latest/whatsnew.html) for
+[What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.
 
 ## INSTALLATION
@@ -86,7 +86,7 @@ Note that you can install any combination of the above, e.g.:
 
 ### Notices
 
-Python 2.x support ended with the release of 1.16.0.  `dnspython` supports Python 3.10
+Python 2.x support ended with the release of 1.16.0.  `dnspython` supports Python 3.11
 and later.  Future support  is aligned with the lifetime of the Python 3 versions.
 
 Documentation has moved to

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/__init__.py

@@ -53,6 +53,7 @@ __all__ = [
     "rrset",
     "serial",
     "set",
+    "style",
     "tokenizer",
     "transaction",
     "tsig",
@@ -63,10 +64,11 @@ __all__ = [
     "version",
     "versioned",
     "wire",
+    "wirebase",
     "xfr",
     "zone",
-    "zonetypes",
     "zonefile",
+    "zonetypes",
 ]
 
 from dns.version import version as __version__  # noqa

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_asyncio_backend.py

@@ -21,32 +21,25 @@ def _get_running_loop():
         return asyncio.get_event_loop()
 
 
-class _DatagramProtocol:
+class _DatagramProtocol(asyncio.DatagramProtocol):
     def __init__(self):
         self.transport = None
-        self.recvfrom = None
+        self.recvq = asyncio.Queue()
 
     def connection_made(self, transport):
         self.transport = transport
 
     def datagram_received(self, data, addr):
-        if self.recvfrom and not self.recvfrom.done():
-            self.recvfrom.set_result((data, addr))
+        self.recvq.put_nowait((data, addr))
 
-    def error_received(self, exc):  # pragma: no cover
-        if self.recvfrom and not self.recvfrom.done():
-            self.recvfrom.set_exception(exc)
+    def error_received(self, exc):
+        self.recvq.put_nowait(exc)
 
     def connection_lost(self, exc):
-        if self.recvfrom and not self.recvfrom.done():
-            if exc is None:
-                # EOF we triggered.  Is there a better way to do this?
-                try:
-                    raise EOFError("EOF")
-                except EOFError as e:
-                    self.recvfrom.set_exception(e)
-            else:
-                self.recvfrom.set_exception(exc)
+        if exc is None:
+            self.recvq.put_nowait(EOFError("EOF"))
+        else:
+            self.recvq.put_nowait(exc)
 
     def close(self):
         if self.transport is not None:
@@ -57,13 +50,13 @@ async def _maybe_wait_for(awaitable, timeout):
     if timeout is not None:
         try:
             return await asyncio.wait_for(awaitable, timeout)
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise dns.exception.Timeout(timeout=timeout)
     else:
         return await awaitable
 
 
-class DatagramSocket(dns._asyncbackend.DatagramSocket):
+class _DatagramSocket(dns._asyncbackend.DatagramSocket):
     def __init__(self, family, transport, protocol):
         super().__init__(family, socket.SOCK_DGRAM)
         self.transport = transport
@@ -76,14 +69,10 @@ class DatagramSocket(dns._asyncbackend.DatagramSocket):
 
     async def recvfrom(self, size, timeout):
         # ignore size as there's no way I know to tell protocol about it
-        done = _get_running_loop().create_future()
-        try:
-            assert self.protocol.recvfrom is None
-            self.protocol.recvfrom = done
-            await _maybe_wait_for(done, timeout)
-            return done.result()
-        finally:
-            self.protocol.recvfrom = None
+        pkg = await _maybe_wait_for(self.protocol.recvq.get(), timeout)
+        if isinstance(pkg, BaseException):
+            raise pkg
+        return pkg
 
     async def close(self):
         self.protocol.close()
@@ -98,7 +87,7 @@ class DatagramSocket(dns._asyncbackend.DatagramSocket):
         raise NotImplementedError
 
 
-class StreamSocket(dns._asyncbackend.StreamSocket):
+class _StreamSocket(dns._asyncbackend.StreamSocket):
     def __init__(self, af, reader, writer):
         super().__init__(af, socket.SOCK_STREAM)
         self.reader = reader
@@ -126,12 +115,12 @@ class StreamSocket(dns._asyncbackend.StreamSocket):
 
 if dns._features.have("doh"):
     import anyio
-    import httpcore
-    import httpcore._backends.anyio
-    import httpx
+    import httpcore2
+    import httpcore2._backends.anyio
+    import httpx2
 
-    _CoreAsyncNetworkBackend = httpcore.AsyncNetworkBackend
-    _CoreAnyIOStream = httpcore._backends.anyio.AnyIOStream  # pyright: ignore
+    _CoreAsyncNetworkBackend = httpcore2.AsyncNetworkBackend
+    _CoreAnyIOStream = httpcore2._backends.anyio.AnyIOStream  # pyright: ignore
 
     from dns.query import _compute_times, _expiration_for_this_attempt, _remaining
 
@@ -144,7 +133,7 @@ if dns._features.have("doh"):
             self._family = family
             if local_port != 0:
                 raise NotImplementedError(
-                    "the asyncio transport for HTTPX cannot set the local port"
+                    "the asyncio transport for httpx2 cannot set the local port"
                 )
 
         async def connect_tcp(
@@ -178,7 +167,7 @@ if dns._features.have("doh"):
                     return _CoreAnyIOStream(stream)
                 except Exception:
                     pass
-            raise httpcore.ConnectError
+            raise httpcore2.ConnectError
 
         async def connect_unix_socket(
             self, path, timeout=None, socket_options=None
@@ -188,7 +177,7 @@ if dns._features.have("doh"):
         async def sleep(self, seconds):  # pylint: disable=signature-differs
             await anyio.sleep(seconds)
 
-    class _HTTPTransport(httpx.AsyncHTTPTransport):
+    class _HTTPTransport(httpx2.AsyncHTTPTransport):
         def __init__(
             self,
             *args,
@@ -204,12 +193,12 @@ if dns._features.have("doh"):
 
                 resolver = dns.asyncresolver.Resolver()
             super().__init__(*args, **kwargs)
-            self._pool._network_backend = _NetworkBackend(
+            self._pool._network_backend = _NetworkBackend(  # type: ignore
                 resolver, local_port, bootstrap_address, family
             )
 
 else:
-    _HTTPTransport = dns._asyncbackend.NullTransport  # type: ignore
+    _HTTPTransport = dns._asyncbackend.NullTransport  # pyright: ignore
 
 
 class Backend(dns._asyncbackend.Backend):
@@ -235,18 +224,18 @@ class Backend(dns._asyncbackend.Backend):
                 source = (dns.inet.any_for_af(af), 0)
             transport, protocol = await loop.create_datagram_endpoint(
                 _DatagramProtocol,  # pyright: ignore
-                source,
+                local_addr=source,
                 family=af,
                 proto=proto,
                 remote_addr=destination,
             )
-            return DatagramSocket(af, transport, protocol)
+            return _DatagramSocket(af, transport, protocol)
         elif socktype == socket.SOCK_STREAM:
             if destination is None:
                 # This shouldn't happen, but we check to make code analysis software
                 # happier.
                 raise ValueError("destination required for stream sockets")
-            (r, w) = await _maybe_wait_for(
+            r, w = await _maybe_wait_for(
                 asyncio.open_connection(
                     destination[0],
                     destination[1],
@@ -258,7 +247,7 @@ class Backend(dns._asyncbackend.Backend):
                 ),
                 timeout,
             )
-            return StreamSocket(af, r, w)
+            return _StreamSocket(af, r, w)
         raise NotImplementedError(
             "unsupported socket " + f"type {socktype}"
         )  # pragma: no cover

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_ddr.py

@@ -7,6 +7,7 @@ import time
 from urllib.parse import urlparse
 
 import dns.asyncbackend
+import dns.exception
 import dns.inet
 import dns.name
 import dns.nameserver
@@ -32,15 +33,25 @@ class _SVCBInfo:
 
     def ddr_check_certificate(self, cert):
         """Verify that the _SVCBInfo's address is in the cert's subjectAltName (SAN)"""
+        # ssl renders IPv6 SAN entries uncompressed and in upper case (e.g.
+        # 2001:DB8:0:0:0:0:0:1), so compare addresses in binary form, not as text.
+        af = dns.inet.af_for_address(self.bootstrap_address)
+        address = dns.inet.inet_pton(af, self.bootstrap_address)
         for name, value in cert["subjectAltName"]:
-            if name == "IP Address" and value == self.bootstrap_address:
-                return True
+            if name != "IP Address":
+                continue
+            try:
+                if dns.inet.inet_pton(af, value) == address:
+                    return True
+            except dns.exception.SyntaxError:
+                # An address of the other family, or one we cannot parse.
+                pass
         return False
 
     def make_tls_context(self):
         ssl = dns.query.ssl
         ctx = ssl.create_default_context()
-        ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+        ctx.minimum_version = ssl.TLSVersion.TLSv1_2  # type: ignore
         return ctx
 
     def ddr_tls_check_sync(self, lifetime):
@@ -94,21 +105,24 @@ def _extract_nameservers_from_svcb(answer):
         # bootstrap address
         if b"h2" in alpns:
             param = rr.params.get(dns.rdtypes.svcbbase.ParamKey.DOHPATH)
-            if param is None or not param.value.endswith(b"{?dns}"):
-                continue
-            path = param.value[:-6].decode()
-            if not path.startswith("/"):
-                path = "/" + path
-            if port is None:
-                port = 443
-            url = f"https://{host}:{port}{path}"
-            # check the URL
-            try:
-                urlparse(url)
-                nameservers.append(dns.nameserver.DoHNameserver(url, bootstrap_address))
-            except Exception:
-                # continue processing other ALPN types
-                pass
+            # A missing or malformed dohpath only rules out the DoH nameserver;
+            # any dot/doq resolver advertised by the same record is still valid.
+            if param is not None and param.value.endswith(b"{?dns}"):
+                path = param.value[:-6].decode()
+                if not path.startswith("/"):
+                    path = "/" + path
+                if port is None:
+                    port = 443
+                url = f"https://{host}:{port}{path}"
+                # check the URL
+                try:
+                    urlparse(url)
+                    nameservers.append(
+                        dns.nameserver.DoHNameserver(url, bootstrap_address)
+                    )
+                except Exception:
+                    # continue processing other ALPN types
+                    pass
         if b"dot" in alpns:
             if port is None:
                 port = 853

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_features.py

@@ -3,10 +3,9 @@
 import importlib.metadata
 import itertools
 import string
-from typing import Dict, List, Tuple
 
 
-def _tuple_from_text(version: str) -> Tuple:
+def _tuple_from_text(version: str) -> tuple:
     text_parts = version.split(".")
     int_parts = []
     for text_part in text_parts:
@@ -44,7 +43,7 @@ def _version_check(
     return True
 
 
-_cache: Dict[str, bool] = {}
+_cache: dict[str, bool] = {}
 
 
 def have(feature: str) -> bool:
@@ -83,13 +82,13 @@ def force(feature: str, enabled: bool) -> None:
     _cache[feature] = enabled
 
 
-_requirements: Dict[str, List[str]] = {
+_requirements: dict[str, list[str]] = {
     ### BEGIN generated requirements
-    "dnssec": ["cryptography>=45"],
-    "doh": ["httpcore>=1.0.0", "httpx>=0.28.0", "h2>=4.2.0"],
-    "doq": ["aioquic>=1.2.0"],
-    "idna": ["idna>=3.10"],
-    "trio": ["trio>=0.30"],
+    "dnssec": ["cryptography>=50"],
+    "doh": ["httpcore2>=2.13", "httpx2>=2.13", "h2>=4.4"],
+    "doq": ["aioquic>=1.3.0"],
+    "idna": ["idna>=3.20"],
+    "trio": ["trio>=0.34"],
     "wmi": ["wmi>=1.5.1"],
     ### END generated requirements
 }

dnspython-2.9.0/dns/_file_util.py

@@ -0,0 +1,21 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import contextlib
+import os
+from typing import IO, Any, cast
+
+
+def as_filename(f: object) -> str | None:
+    if isinstance(f, (str, os.PathLike)):
+        return os.fsdecode(f)
+    return None
+
+
+def maybe_open(
+    f: str | os.PathLike | IO[Any], mode: str = "r", encoding: str | None = None
+) -> contextlib.AbstractContextManager[IO[Any]]:
+    filename = as_filename(f)
+    if filename is not None:
+        return open(filename, mode, encoding=encoding)
+    # as_filename() is not a type guard, so narrow f by hand
+    return contextlib.nullcontext(cast(IO[Any], f))

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_immutable_ctx.py

@@ -41,7 +41,7 @@ def _immutable_init(f):
         finally:
             _in__init__.reset(previous)
 
-    nf.__signature__ = inspect.signature(f)  # pyright: ignore
+    nf.__signature__ = inspect.signature(f)  # type: ignore
     return nf
 
 

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_no_ssl.py

@@ -30,10 +30,10 @@ class SSLContext:
         self.check_hostname: bool = False
         self.verify_mode: int = CERT_NONE
 
-    def wrap_socket(self, *args, **kwargs) -> "SSLSocket":  # type: ignore
+    def wrap_socket(self, *args, **kwargs) -> "SSLSocket":  # pyright: ignore
         raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
 
-    def set_alpn_protocols(self, *args, **kwargs):  # type: ignore
+    def set_alpn_protocols(self, *args, **kwargs):  # pyright: ignore
         raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
 
 
@@ -57,5 +57,5 @@ class SSLSocket:
         return False
 
 
-def create_default_context(*args, **kwargs) -> SSLContext:  # type: ignore
+def create_default_context(*args, **kwargs) -> SSLContext:  # pyright: ignore
     raise Exception("no ssl support")  # pylint: disable=broad-exception-raised

dnspython-2.9.0/dns/_render_util.py

@@ -0,0 +1,21 @@
+import contextlib
+
+import dns.exception
+
+
+@contextlib.contextmanager
+def prefixed_length(output, length_length):
+    output.write(b"\00" * length_length)
+    start = output.tell()
+    yield
+    end = output.tell()
+    length = end - start
+    if length > 0:
+        try:
+            output.seek(start - length_length)
+            try:
+                output.write(length.to_bytes(length_length, "big"))
+            except OverflowError:
+                raise dns.exception.FormError
+        finally:
+            output.seek(end)

dnspython-2.9.0/dns/_text_util.py

@@ -0,0 +1,45 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+"""Internal text-processing helpers."""
+
+import functools
+import string
+
+_ASCII_DIGITS = frozenset(string.digits)
+
+_ALL_ASCII_DIGITS = string.digits + string.ascii_lowercase
+
+
+def is_ascii_digit(c: str) -> bool:
+    """Is *c* one of the ASCII digits "0" through "9"?
+
+    Unlike ``str.isdigit()`` and ``str.isdecimal()``, this returns ``False``
+    for non-ASCII digits such as U+0967 DEVANAGARI DIGIT ONE.
+    """
+    return c in _ASCII_DIGITS
+
+
+@functools.cache
+def _ascii_digits_for_base(base: int) -> frozenset[str]:
+    if base < 2 or base > 36:
+        raise ValueError(f"invalid base {base}")
+    digits = _ALL_ASCII_DIGITS[:base]
+    return frozenset(digits + digits.upper())
+
+
+def is_ascii_digits(text: str, base: int = 10) -> bool:
+    """Is *text* a non-empty string consisting only of ASCII digits valid in
+    *base*?
+
+    Digits greater than 9 are the ASCII letters, in either case, as with
+    ``int()``.  Unlike ``int()``, a sign, whitespace, underscores, and base
+    prefixes such as ``0x`` are not allowed.  Unlike ``str.isdigit()`` and
+    ``str.isdecimal()``, non-ASCII digits such as U+0967 DEVANAGARI DIGIT ONE
+    are not allowed.
+
+    Raises ``ValueError`` if *base* is not between 2 and 36 inclusive.
+    """
+    if base == 10:
+        return text.isascii() and text.isdecimal()
+    digits = _ascii_digits_for_base(base)
+    return len(text) > 0 and all(c in digits for c in text)

dnspython-2.9.0/dns/_tls_util.py

@@ -0,0 +1,21 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import os
+
+import dns._file_util
+
+
+def convert_verify_to_cafile_and_capath(
+    verify: bool | str | os.PathLike,
+) -> tuple[str | None, str | None]:
+    cafile: str | None = None
+    capath: str | None = None
+    filename = dns._file_util.as_filename(verify)
+    if filename is not None:
+        if os.path.isfile(filename):
+            cafile = filename
+        elif os.path.isdir(filename):
+            capath = filename
+        else:
+            raise ValueError("invalid verify string")
+    return cafile, capath

{dnspython-2.8.0rc1 → dnspython-2.9.0}/dns/_trio_backend.py

@@ -5,7 +5,7 @@
 import socket
 
 import trio
-import trio.socket  # type: ignore
+import trio.socket  # pyright: ignore
 
 import dns._asyncbackend
 import dns._features
@@ -103,12 +103,12 @@ class StreamSocket(dns._asyncbackend.StreamSocket):
 
 
 if dns._features.have("doh"):
-    import httpcore
-    import httpcore._backends.trio
-    import httpx
+    import httpcore2
+    import httpcore2._backends.trio
+    import httpx2
 
-    _CoreAsyncNetworkBackend = httpcore.AsyncNetworkBackend
-    _CoreTrioStream = httpcore._backends.trio.TrioStream
+    _CoreAsyncNetworkBackend = httpcore2.AsyncNetworkBackend
+    _CoreTrioStream = httpcore2._backends.trio.TrioStream
 
     from dns.query import _compute_times, _expiration_for_this_attempt, _remaining
 
@@ -155,7 +155,7 @@ if dns._features.have("doh"):
                     return _CoreTrioStream(sock.stream)
                 except Exception:
                     continue
-            raise httpcore.ConnectError
+            raise httpcore2.ConnectError
 
         async def connect_unix_socket(
             self, path, timeout=None, socket_options=None
@@ -165,7 +165,7 @@ if dns._features.have("doh"):
         async def sleep(self, seconds):  # pylint: disable=signature-differs
             await trio.sleep(seconds)
 
-    class _HTTPTransport(httpx.AsyncHTTPTransport):
+    class _HTTPTransport(httpx2.AsyncHTTPTransport):
         def __init__(
             self,
             *args,
@@ -181,12 +181,12 @@ if dns._features.have("doh"):
 
                 resolver = dns.asyncresolver.Resolver()
             super().__init__(*args, **kwargs)
-            self._pool._network_backend = _NetworkBackend(
+            self._pool._network_backend = _NetworkBackend(  # type: ignore
                 resolver, local_port, bootstrap_address, family
             )
 
 else:
-    _HTTPTransport = dns._asyncbackend.NullTransport  # type: ignore
+    _HTTPTransport = dns._asyncbackend.NullTransport  # pyright: ignore
 
 
 class Backend(dns._asyncbackend.Backend):