update async tests with less upython workaround and more cpython compatibility

5 files changed, 55 insertions, 55 deletions

diff --git a/py/compile.c b/py/compile.c
index da31846e2..45a586594 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -40,6 +40,8 @@
 
 #if MICROPY_ENABLE_COMPILER
 
+#define DEBUG_PRINT(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
+
 // TODO need to mangle __attr names
 
 #define INVALID_LABEL (0xffff)
@@ -853,7 +855,7 @@ STATIC void compile_decorated(compiler_t *comp, mp_parse_node_struct_t *pns) {
         mp_parse_node_struct_t *pns0 = (mp_parse_node_struct_t*)pns_body->nodes[0];
         body_name = compile_funcdef_helper(comp, pns0, emit_options);
         scope_t *fscope = (scope_t*)pns0->nodes[4];
-        fscope->scope_flags |= MP_SCOPE_FLAG_GENERATOR;
+        fscope->scope_flags |= MP_SCOPE_FLAG_GENERATOR | MP_SCOPE_FLAG_ASYNC;
     #endif
     } else {
         assert(MP_PARSE_NODE_STRUCT_KIND(pns_body) == PN_classdef); // should be
@@ -2655,11 +2657,13 @@ STATIC void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pn
     compile_require_async_context(comp, pns);
     compile_atom_expr_normal(comp, pns);
 
-    
+    // If it's an awaitable thing, need to reach for the __await__ method for the coroutine.
+    // async def functions' __await__ return themselves, which are able to receive a send(),
+    // while other types with custom __await__ implementations return async generators.
     EMIT_ARG(load_method, MP_QSTR___await__, false);
     EMIT_ARG(call_method, 0, 0, 0);
-    // EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE); // don't yield anything from an awaitable; only return the final result.
-    // EMIT_ARG(yield, MP_EMIT_YIELD_FROM);
+    EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
+    EMIT_ARG(yield, MP_EMIT_YIELD_FROM);
 }
 #endif
 
diff --git a/py/objgenerator.c b/py/objgenerator.c
index baa6a9849..5e651ac26 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -234,12 +234,8 @@ STATIC mp_obj_t gen_instance_await(mp_obj_t self_in) {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_AttributeError,
             translate("type object 'generator' has no attribute '__await__'")));
     }
-    mp_obj_t ret = gen_resume_and_raise(self_in, mp_const_none, MP_OBJ_NULL);
-    if (ret == MP_OBJ_STOP_ITERATION) {
-        nlr_raise(mp_obj_new_exception(&mp_type_StopIteration));
-    } else {
-        return ret;
-    }
+    // You can directly call send on a coroutine generator or you can __await__ then send on the return of that.
+    return self;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(gen_instance_await_obj, gen_instance_await);
 #endif
diff --git a/tests/basics/async_await2.py b/tests/basics/async_await2.py
index 7097ce85a..2c5015fb4 100644
--- a/tests/basics/async_await2.py
+++ b/tests/basics/async_await2.py
@@ -1,22 +1,22 @@
 # test await expression
 
-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 wait(value):
-    print('wait value:', value)
-    msg = yield 'message from wait(%u)' % value
-    print('wait got back:', msg)
-    return 10
+class Awaitable:
+    def __init__(self, value):
+        self.value = value
+
+    def __await__(self):
+        print('wait value:', self.value)
+        msg = yield 'message from wait(%u)' % self.value
+        print('wait got back:', msg)
+        return 10
 
 async def f():
-    x = await wait(1)**2
+    x = await Awaitable(1)**2
     print('x =', x)
 
 coro = f()
diff --git a/tests/basics/async_for2.py b/tests/basics/async_for2.py
index add74dd38..d7b97cb38 100644
--- a/tests/basics/async_for2.py
+++ b/tests/basics/async_for2.py
@@ -1,19 +1,19 @@
 # test waiting within "async for" __anext__ function
 
-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
-
-@coroutine
-def f(x):
-    print('f start:', x)
-    yield x + 1
-    yield x + 2
-    return x + 3
+# 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__.
+
+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 ARange:
     def __init__(self, high):
@@ -27,7 +27,7 @@ class ARange:
 
     async def __anext__(self):
         print('anext')
-        print('f returned:', await f(20))
+        print('f returned:', await Awaitable(20))
         if self.cur < self.high:
             val = self.cur
             self.cur += 1
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()