added support for positional-only func arguments

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -319,7 +319,8 @@ def __init__(self, func_def, code_list, code_str, global_ctx):
         self.local_names = None
         self.local_sym_table = {}
         self.doc_string = ast.get_docstring(func_def)
-        self.num_posn_arg = len(self.func_def.args.args) - len(self.defaults)
+        self.num_posonly_arg = len(self.func_def.args.posonlyargs)
+        self.num_posn_arg = self.num_posonly_arg + len(self.func_def.args.args) - len(self.defaults)
         self.code_list = code_list
         self.code_str = code_str
         self.exception = None
@@ -342,7 +343,7 @@ async def eval_defaults(self, ast_ctx):
         self.defaults = []
         for val in self.func_def.args.defaults:
             self.defaults.append(await ast_ctx.aeval(val))
-        self.num_posn_arg = len(self.func_def.args.args) - len(self.defaults)
+        self.num_posn_arg = self.num_posonly_arg + len(self.func_def.args.args) - len(self.defaults)
         self.kw_defaults = []
         for val in self.func_def.args.kw_defaults:
             self.kw_defaults.append({"ok": bool(val), "val": None if not val else await ast_ctx.aeval(val)})
@@ -669,7 +670,7 @@ def get_doc_string(self):
     def get_positional_args(self):
         """Return the function positional arguments."""
         args = []
-        for arg in self.func_def.args.args:
+        for arg in self.func_def.args.posonlyargs + self.func_def.args.args:
             args.append(arg.arg)
         return args
 
@@ -689,14 +690,17 @@ async def call(self, ast_ctx, *args, **kwargs):
         if args is None:
             args = []
         kwargs = kwargs.copy() if kwargs else {}
-        for i, func_def_arg in enumerate(self.func_def.args.args):
+        bad_kwargs = []
+        for i, func_def_arg in enumerate(self.func_def.args.posonlyargs + self.func_def.args.args):
             var_name = func_def_arg.arg
             val = None
             if i < len(args):
                 val = args[i]
                 if var_name in kwargs:
                     raise TypeError(f"{self.name}() got multiple values for argument '{var_name}'")
             elif var_name in kwargs:
+                if i < self.num_posonly_arg:
+                    bad_kwargs.append(var_name)
                 val = kwargs[var_name]
                 del kwargs[var_name]
             elif self.num_posn_arg <= i < len(self.defaults) + self.num_posn_arg:
@@ -706,6 +710,11 @@ async def call(self, ast_ctx, *args, **kwargs):
                     f"{self.name}() missing {self.num_posn_arg - i} required positional arguments"
                 )
             sym_table[var_name] = val
+        if len(bad_kwargs) > 0:
+            raise TypeError(
+                f"{self.name}() got some positional-only arguments passed as keyword arguments: '{', '.join(bad_kwargs)}'"
+            )
+
         for i, kwonlyarg in enumerate(self.func_def.args.kwonlyargs):
             var_name = kwonlyarg.arg
             if var_name in kwargs:
@@ -724,12 +733,13 @@ async def call(self, ast_ctx, *args, **kwargs):
             # since they could have non-trigger decorators too
             unexpected = ", ".join(sorted(set(kwargs.keys()) - TRIGGER_KWARGS))
             raise TypeError(f"{self.name}() called with unexpected keyword arguments: {unexpected}")
+        num_posn = self.num_posonly_arg + len(self.func_def.args.args)
         if self.func_def.args.vararg:
-            if len(args) > len(self.func_def.args.args):
-                sym_table[self.func_def.args.vararg.arg] = tuple(args[len(self.func_def.args.args) :])
+            if len(args) > num_posn:
+                sym_table[self.func_def.args.vararg.arg] = tuple(args[num_posn:])
             else:
                 sym_table[self.func_def.args.vararg.arg] = ()
-        elif len(args) > len(self.func_def.args.args):
+        elif len(args) > num_posn:
             raise TypeError(f"{self.name}() called with too many positional arguments")
         for name, value in self.local_sym_table.items():
             if name in sym_table:

tests/test_unit_eval.py

@@ -221,6 +221,14 @@
     ["x = 5; exec('x = 2 * x'); x", 10],
     [
         """
+def f(x, /, y = 5):
+    return x + y
+[f(2), f(2, 2), f(2, y=3)]
+""",
+        [7, 4, 5],
+    ],
+    [
+        """
 def func():
     x = 5
     exec('x = 2 * x')
@@ -1510,6 +1518,22 @@ def func(b=1):
 """,
         "Exception in test line 5 column 23: func() called with unexpected keyword arguments: a",
     ],
+    [
+        """
+def f(x, z, /, y = 5):
+    return x + y
+f(x=4, z=2)
+""",
+        "Exception in test line 4 column 9: f() got some positional-only arguments passed as keyword arguments: 'x, z'",
+    ],
+    [
+        """
+def f(x, /, y = 5):
+    return x + y
+f(x=4)
+""",
+        "Exception in test line 4 column 4: f() got some positional-only arguments passed as keyword arguments: 'x'",
+    ],
     [
         "from .xyz import abc",
         "Exception in test line 1 column 0: attempted relative import with no known parent package",