eval() overwrites local sym table by default

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -2213,12 +2213,14 @@ def completions(self, root):
                 words.add(name)
         return words
 
-    async def eval(self, new_state_vars=None):
+    async def eval(self, new_state_vars=None, merge_local=False):
         """Execute parsed code, with the optional state variables added to the scope."""
         self.exception = None
         self.exception_obj = None
         self.exception_long = None
         if new_state_vars:
+            if not merge_local:
+                self.local_sym_table = {}
             self.local_sym_table.update(new_state_vars)
         if self.ast:
             try:

custom_components/pyscript/event.py

@@ -70,7 +70,7 @@ def notify_del(cls, event_type, queue):
     async def update(cls, event_type, func_args):
         """Deliver all notifications for an event of the given type."""
 
-        _LOGGER.debug("event.update(%s, %s, %s)", event_type, vars, 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])

tests/test_unit_eval.py

@@ -1384,7 +1384,7 @@ async def run_one_test(test_data):
     if ast.get_exception() is not None:
         print(f"Parsing {source} failed: {ast.get_exception()}")
     # print(ast.dump())
-    result = await ast.eval({"sym_local": 10})
+    result = await ast.eval({"sym_local": 10}, merge_local=True)
     assert result == expect