non-local keyword arguments in inner functions are now correctly resolved; see #163

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -2014,6 +2014,8 @@ async def get_names_set(self, arg, names, nonlocal_names, global_names, local_na
                 await self.get_names_set(arg.func, names, nonlocal_names, global_names, local_names)
                 for this_arg in arg.args:
                     await self.get_names_set(this_arg, names, nonlocal_names, global_names, local_names)
+                for this_arg in arg.keywords or []:
+                    await self.get_names_set(this_arg, names, nonlocal_names, global_names, local_names)
                 return
             elif cls_name in {"FunctionDef", "ClassDef", "AsyncFunctionDef"}:
                 local_names.add(arg.name)

docs/new_features.rst

@@ -72,4 +72,5 @@ Bug fixes since 1.2.1 include:
 - An exception is raised when a function is called with unexpected keyword parameters that don't have corresponding
   keyword arguments (however, the trigger parameter names are excluded from this check, since trigger functions
   are allowed to have any subset of keyword arguments).
+- Non-local keyword arguments in inner functions are now correctly resolved; see #163
 - Trigger on any state change now matches state names with leading digits; see #165

tests/test_unit_eval.py

@@ -756,6 +756,20 @@ def foo2():
     ],
     [
         """
+def test_func(arg, kw=0):
+    return [arg, kw]
+
+def func_factory(func_handle,*args,**kwargs):
+    def func_trig():
+        return func_handle(*args,**kwargs)
+    return func_trig
+
+func_factory(test_func, "my_arg", kw=10)()
+""",
+        ["my_arg", 10],
+    ],
+    [
+        """
 import threading
 
 # will run in the same thread, and return a different thread ident