extmod/uasyncio: Make leaf uasyncio functions non-async.

dpgeorge · dpgeorge · commit 62588a10fbb4 · 2020-12-02T22:27:24.000+11:00
Otherwise they are async generators which is not the intention.

Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
@@ -21,7 +21,7 @@ def set(self):
     def clear(self):
         self.state = False
 
-    async def wait(self):
+    def wait(self):
         if not self.state:
             # Event not set, put the calling task on the event's waiting queue
             self.waiting.push_head(core.cur_task)
diff --git a/extmod/uasyncio/lock.py b/extmod/uasyncio/lock.py
@@ -28,7 +28,7 @@ def release(self):
             # No Task waiting so unlock
             self.state = 0
 
-    async def acquire(self):
+    def acquire(self):
         if self.state != 0:
             # Lock unavailable, put the calling Task on the waiting queue
             self.waiting.push_head(core.cur_task)
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
@@ -26,11 +26,11 @@ async def wait_closed(self):
         # TODO yield?
         self.s.close()
 
-    async def read(self, n):
+    def read(self, n):
         yield core._io_queue.queue_read(self.s)
         return self.s.read(n)
 
-    async def readexactly(self, n):
+    def readexactly(self, n):
         r = b""
         while n:
             yield core._io_queue.queue_read(self.s)
@@ -42,7 +42,7 @@ async def readexactly(self, n):
                 n -= len(r2)
         return r
 
-    async def readline(self):
+    def readline(self):
         l = b""
         while True:
             yield core._io_queue.queue_read(self.s)
@@ -54,7 +54,7 @@ async def readline(self):
     def write(self, buf):
         self.out_buf += buf
 
-    async def drain(self):
+    def drain(self):
         mv = memoryview(self.out_buf)
         off = 0
         while off < len(mv):
@@ -71,7 +71,7 @@ async def drain(self):
 
 
 # Create a TCP stream connection to a remote host
-async def open_connection(host, port):
+def open_connection(host, port):
     from uerrno import EINPROGRESS
     import usocket as socket
 
@@ -103,7 +103,7 @@ def close(self):
     async def wait_closed(self):
         await self.task
 
-    async def _serve(self, cb, host, port, backlog):
+    def _serve(self, cb, host, port, backlog):
         import usocket as socket
 
         ai = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
