extmod/uasyncio: Fix syntax of generator functions

damz · damz · commit 1c0ca83fc173 · 2022-12-08T10:21:35.000-08:00
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
@@ -23,7 +23,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(core.cur_task)
diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
@@ -4,7 +4,7 @@
 from . import core
 
 
-def _run(waiter, aw):
+async def _run(waiter, aw):
     try:
         result = await aw
         status = True
@@ -61,7 +61,7 @@ def remove(t):
         pass
 
 
-async def gather(*aws, return_exceptions=False):
+def gather(*aws, return_exceptions=False):
     if not aws:
         return []
 
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(core.cur_task)
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
@@ -26,7 +26,7 @@ async def wait_closed(self):
         # TODO yield?
         self.s.close()
 
-    async def read(self, n=-1):
+    def read(self, n=-1):
         r = b""
         while True:
             yield core._io_queue.queue_read(self.s)
@@ -38,11 +38,11 @@ async def read(self, n=-1):
                     return r
                 r += r2
 
-    async def readinto(self, buf):
+    def readinto(self, buf):
         yield core._io_queue.queue_read(self.s)
         return self.s.readinto(buf)
 
-    async def readexactly(self, n):
+    def readexactly(self, n):
         r = b""
         while n:
             yield core._io_queue.queue_read(self.s)
@@ -54,7 +54,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)
@@ -73,10 +73,10 @@ def write(self, buf):
                 buf = buf[ret:]
         self.out_buf += buf
 
-    async def drain(self):
+    def drain(self):
         if not self.out_buf:
             # Drain must always yield, so a tight loop of write+drain can't block the scheduler.
-            return await core.sleep_ms(0)
+            return (yield from core.sleep_ms(0))
         mv = memoryview(self.out_buf)
         off = 0
         while off < len(mv):
@@ -93,7 +93,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
 
