support qh3 as well as aioquic

diff --git a/dns/quic/__init__.py b/dns/quic/__init__.py
index 69813f9f18cc28eac706225187fb93c342aed95b..cb032632d5fa2ed25cba921484938b75b00901e4 100644 (file)
--- a/dns/quic/__init__.py
+++ b/dns/quic/__init__.py
@@ -1,8 +1,14 @@
 # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
 
 try:
-    import aioquic.quic.configuration  # type: ignore
-
+    # pylint: disable=unused-import
+    try:
+        import qh3 as aioquic  # type: ignore
+        import qh3.quic.configuration  # type: ignore
+    except ImportError:
+        import aioquic  # type: ignore
+        import aioquic.quic.configuration  # type: ignore
+    # pylint: enable=unused-import
     import dns.asyncbackend
     from dns._asyncbackend import NullContext
     from dns.quic._asyncio import (

diff --git a/dns/quic/_asyncio.py b/dns/quic/_asyncio.py
index 0f44331f61830b3d9c7da6bb26b4f72e89744d64..8b793b7a7b407924762e272923db24e3bf6c625b 100644 (file)
--- a/dns/quic/_asyncio.py
+++ b/dns/quic/_asyncio.py
@@ -6,9 +6,18 @@ import ssl
 import struct
 import time
 
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
+# pylint: disable=unused-import
+try:
+    import qh3 as aioquic  # type: ignore
+    import qh3.quic.configuration  # type: ignore
+    import qh3.quic.connection  # type: ignore
+    import qh3.quic.events  # type: ignore
+except ImportError:
+    import aioquic  # type: ignore
+    import aioquic.quic.configuration  # type: ignore
+    import aioquic.quic.connection  # type: ignore
+    import aioquic.quic.events  # type: ignore
+# pylint: enable=unused-import
 
 import dns.asyncbackend
 import dns.exception

diff --git a/dns/quic/_common.py b/dns/quic/_common.py
index 0eacc691aac712294ff24afbeef91b7dafbcb674..e01112a0c523df028dccfc94d0704a741701d78a 100644 (file)
--- a/dns/quic/_common.py
+++ b/dns/quic/_common.py
@@ -7,8 +7,16 @@ import struct
 import time
 from typing import Any, Optional
 
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
+# pylint: disable=unused-import
+try:
+    import qh3 as aioquic  # type: ignore
+    import qh3.quic.configuration  # type: ignore
+    import qh3.quic.connection  # type: ignore
+except ImportError:
+    import aioquic  # type: ignore
+    import aioquic.quic.configuration  # type: ignore
+    import aioquic.quic.connection  # type: ignore
+# pylint: enable=unused-import
 
 import dns.inet
 

diff --git a/dns/quic/_sync.py b/dns/quic/_sync.py
index d6731c904c34605dff3a78afec9d2e22f0bbb81f..8720338b1073ed6e00ba4db7d3d5fdf5f3624c27 100644 (file)
--- a/dns/quic/_sync.py
+++ b/dns/quic/_sync.py
@@ -7,9 +7,18 @@ import struct
 import threading
 import time
 
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
+# pylint: disable=unused-import
+try:
+    import qh3 as aioquic  # type: ignore
+    import qh3.quic.configuration  # type: ignore
+    import qh3.quic.connection  # type: ignore
+    import qh3.quic.events  # type: ignore
+except ImportError:
+    import aioquic  # type: ignore
+    import aioquic.quic.configuration  # type: ignore
+    import aioquic.quic.connection  # type: ignore
+    import aioquic.quic.events  # type: ignore
+# pylint: enable=unused-import
 
 import dns.exception
 import dns.inet

diff --git a/dns/quic/_trio.py b/dns/quic/_trio.py
index 0284c98294feb1ddcf406e0a8ccc39b791d6e097..72440397fc44e311a16fd1ddf0b8545ce8f9df25 100644 (file)
--- a/dns/quic/_trio.py
+++ b/dns/quic/_trio.py
@@ -5,9 +5,19 @@ import ssl
 import struct
 import time
 
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
+# pylint: disable=unused-import
+try:
+    import qh3 as aioquic  # type: ignore
+    import qh3.quic.configuration  # type: ignore
+    import qh3.quic.connection  # type: ignore
+    import qh3.quic.events  # type: ignore
+except ImportError:
+    import aioquic  # type: ignore
+    import aioquic.quic.configuration  # type: ignore
+    import aioquic.quic.connection  # type: ignore
+    import aioquic.quic.events  # type: ignore
+# pylint: enable=unused-import
+
 import trio
 
 import dns.exception

diff --git a/tests/nanoquic.py b/tests/nanoquic.py
index 47c10431bc158149bc16093d113c6eb0f533fcb9..e53612f65115d373cfc322a36317a3a3b62b0683 100644 (file)
--- a/tests/nanoquic.py
+++ b/tests/nanoquic.py
@@ -6,10 +6,17 @@ try:
     import struct
     import threading
 
-    import aioquic.asyncio
-    import aioquic.asyncio.server
-    import aioquic.quic.configuration
-    import aioquic.quic.events
+    try:
+        import qh3 as aioquic
+        import qh3.asyncio
+        import qh3.asyncio.server
+        import qh3.quic.configuration
+        import qh3.quic.events
+    except ImportError:
+        import aioquic.asyncio
+        import aioquic.asyncio.server
+        import aioquic.quic.configuration
+        import aioquic.quic.events
 
     import dns.asyncquery
     import dns.message