redo fix for #512; see #516

Author: craigbarratt

custom_components/pyscript/event.py

@@ -73,4 +73,4 @@ async def update(cls, event_type, func_args):
         _LOGGER.debug("event.update(%s, %s)", event_type, func_args)
         if event_type in cls.notify:
             for queue in cls.notify[event_type]:
-                await queue.put(["event", func_args])
+                await queue.put(["event", func_args.copy()])

custom_components/pyscript/mqtt.py

@@ -88,4 +88,4 @@ async def update(cls, topic, func_args):
         _LOGGER.debug("mqtt.update(%s, %s, %s)", topic, vars, func_args)
         if topic in cls.notify:
             for queue in cls.notify[topic]:
-                await queue.put(["mqtt", func_args])
+                await queue.put(["mqtt", func_args.copy()])

custom_components/pyscript/state.py

@@ -128,7 +128,7 @@ async def update(cls, new_vars, func_args):
         if notify:
             _LOGGER.debug("state.update(%s, %s)", new_vars, func_args)
             for queue, var_names in notify.items():
-                await queue.put(["state", [cls.notify_var_get(var_names, new_vars), func_args]])
+                await queue.put(["state", [cls.notify_var_get(var_names, new_vars), func_args.copy()]])
 
     @classmethod
     def notify_var_get(cls, var_names, new_vars):

custom_components/pyscript/trigger.py

@@ -1061,11 +1061,9 @@ async def trigger_watch(self):
                 user_kwargs = {}
                 if state_trig_timeout:
                     new_vars, func_args = state_trig_notify_info
-                    func_args = func_args.copy()
                     state_trig_waiting = False
                 elif notify_type == "state":
                     new_vars, func_args = notify_info
-                    func_args = func_args.copy()
                     user_kwargs = self.state_trigger_kwargs.get("kwargs", {})
 
                     if not ident_any_values_changed(func_args, self.state_trig_ident_any):