decorator func arguments now expand *list

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -449,7 +449,9 @@ async def trigger_init(self):
                         file_desc.close()
                     except Exception as exc:
                         self.logger.error(
-                            "Unable to decode yaml doc_string for %s(): %s", self.name, str(exc),
+                            "Unable to decode yaml doc_string for %s(): %s",
+                            self.name,
+                            str(exc),
                         )
                         raise exc
                 else:
@@ -574,7 +576,7 @@ async def eval_decorators(self, ast_ctx):
                 and isinstance(dec.func, ast.Name)
                 and dec.func.id in TRIG_SERV_DECORATORS
             ):
-                args = [await ast_ctx.aeval(arg) for arg in dec.args]
+                args = await ast_ctx.eval_elt_list(dec.args)
                 kwargs = {keyw.arg: await ast_ctx.aeval(keyw.value) for keyw in dec.keywords}
                 dec_trig.append([dec.func.id, args, kwargs if len(kwargs) > 0 else None])
             elif isinstance(dec, ast.Name) and dec.id in TRIG_SERV_DECORATORS:
@@ -1361,7 +1363,8 @@ async def recurse_assign(self, lhs, val):
                     star_len = len(vals) - len(lhs.elts) + 1
                     star_name = lhs_elt.value.id
                     await self.recurse_assign(
-                        ast.Name(id=star_name, ctx=ast.Store()), vals[val_idx : val_idx + star_len],
+                        ast.Name(id=star_name, ctx=ast.Store()),
+                        vals[val_idx : val_idx + star_len],
                     )
                     val_idx += star_len
                 else:

tests/test_decorators.py

@@ -7,7 +7,6 @@
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
-
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
 
@@ -35,7 +34,8 @@ async def setup_script(hass, notify_q, now, source):
     ), patch(
         "custom_components.pyscript.global_ctx.os.path.getmtime", return_value=1000
     ), patch(
-        "custom_components.pyscript.install_requirements", return_value=None,
+        "custom_components.pyscript.install_requirements",
+        return_value=None,
     ):
         assert await async_setup_component(hass, "pyscript", {DOMAIN: {}})
 
@@ -107,7 +107,8 @@ def func_startup_sync(trigger_type=None, trigger_time=None):
     log.info(f"func_startup_sync setting pyscript.done = {seq_num}, trigger_type = {trigger_type}, trigger_time = {trigger_time}")
     pyscript.done = seq_num
 
-@state_trigger("pyscript.var1 == '1'")
+trig_list = ["pyscript.var1 == '100'", "pyscript.var1 == '1'"]
+@state_trigger(*trig_list)
 @once
 def func1():
     global seq_num