Merge branch 'main' into recv_into_size_check6.1.0-alpha.0

1 files changed, 16 insertions, 16 deletions

diff --git a/tests/basics/async_with2.py b/tests/basics/async_with2.py
index 5fb06ba60..2e9e9e5a7 100644
--- a/tests/basics/async_with2.py
+++ b/tests/basics/async_with2.py
@@ -1,32 +1,32 @@
 # test waiting within async with enter/exit functions
 
-import sys
-if sys.implementation.name in ('micropython', 'circuitpython'):
-    # uPy allows normal generators to be awaitables
-    coroutine = lambda f: f
-else:
-    import types
-    coroutine = types.coroutine
+# uPy allows normal generators to be awaitables.
+# CircuitPython does not.
+# In CircuitPython you need to have an __await__ method on an awaitable like in CPython;
+#  and like in CPython, generators do not have __await__.
 
-@coroutine
-def f(x):
-    print('f start:', x)
-    yield x + 1
-    yield x + 2
-    return x + 3
+class Awaitable:
+    def __init__(self, x):
+        self.x = x
+
+    def __await__(self):
+        print('f start:', self.x)
+        yield self.x + 1
+        yield self.x + 2
+        return self.x + 3
 
 class AContext:
     async def __aenter__(self):
         print('enter')
-        print('f returned:', await f(10))
+        print('f returned:', await Awaitable(10))
     async def __aexit__(self, exc_type, exc, tb):
         print('exit', exc_type, exc)
-        print('f returned:', await f(20))
+        print('f returned:', await Awaitable(20))
 
 async def coro():
     async with AContext():
         print('body start')
-        print('body f returned:', await f(30))
+        print('body f returned:', await Awaitable(30))
         print('body end')
 
 o = coro()