don't skip await in aeval(); see #710

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -931,18 +931,14 @@ async def ast_not_implemented(self, arg, *args):
         name = "ast_" + arg.__class__.__name__.lower()
         raise NotImplementedError(f"{self.name}: not implemented ast " + name)
 
-    async def aeval(self, arg, undefined_check=True, do_await=True):
+    async def aeval(self, arg, undefined_check=True):
         """Vector to specific function based on ast class type."""
         name = "ast_" + arg.__class__.__name__.lower()
         try:
             if hasattr(arg, "lineno"):
                 self.lineno = arg.lineno
                 self.col_offset = arg.col_offset
-            val = (
-                await getattr(self, name, self.ast_not_implemented)(arg)
-                if do_await
-                else getattr(self, name, self.ast_not_implemented)(arg)
-            )
+            val = await getattr(self, name, self.ast_not_implemented)(arg)
             if undefined_check and isinstance(val, EvalName):
                 raise NameError(f"name '{val.name}' is not defined")
             return val
@@ -2025,7 +2021,7 @@ async def ast_formattedvalue(self, arg):
 
     async def ast_await(self, arg):
         """Evaluate await expr."""
-        coro = await self.aeval(arg.value, do_await=False)
+        coro = await self.aeval(arg.value)
         if coro and asyncio.iscoroutine(coro):
             return await coro
         return coro

tests/test_unit_eval.py

@@ -1456,6 +1456,22 @@ async def run():
 """,
         "done",
     ],
+    [
+        """
+class Test:
+    def __init__(self, value):
+        self.val = value
+
+    async def getval(self):
+        async def handler():
+            return self.val
+        return handler()
+
+t = Test(20)
+[await(await t.getval()), t.getval()]
+""",
+        [20, 20],
+    ],
 ]