From: Bob Halley <halley@dnspython.org>
Date: Fri, 12 Jun 2020 14:38:34 +0000 (-0700)
Subject: fix nanonameserver after removal of dns.trio
X-Git-Tag: v2.0.0rc1~112^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eedbdd2bf6cd5bdee22fcfc1c41105ee57e87b45;p=thirdparty%2Fdnspython.git

fix nanonameserver after removal of dns.trio
---

diff --git a/tests/nanonameserver.py b/tests/nanonameserver.py
index 850d7482..b1bb6f2e 100644
--- a/tests/nanonameserver.py
+++ b/tests/nanonameserver.py
@@ -8,9 +8,22 @@ import struct
 import threading
 import trio
 
+import dns.asyncquery
 import dns.message
 import dns.rcode
-import dns.trio.query
+
+async def read_exactly(stream, count):
+    """Read the specified number of bytes from stream.  Keep trying until we
+    either get the desired amount, or we hit EOF.
+    """
+    s = b''
+    while count > 0:
+        n = await stream.receive_some(count)
+        if n == b'':
+            raise EOFError
+        count = count - len(n)
+        s = s + n
+    return s
 
 class ConnectionType(enum.IntEnum):
     UDP = 1
@@ -182,9 +195,9 @@ class Server(threading.Thread):
         try:
             peer = stream.socket.getpeername()
             while True:
-                ldata = await dns.trio.query.read_exactly(stream, 2)
+                ldata = await read_exactly(stream, 2)
                 (l,) = struct.unpack("!H", ldata)
-                wire = await dns.trio.query.read_exactly(stream, l)
+                wire = await read_exactly(stream, l)
                 wire = self.handle_wire(wire, peer, ConnectionType.TCP)
                 if wire is not None:
                     l = len(wire)