MAINT: simplify arg/param handing in normalize

Author: ev-br

torch_np/_normalizations.py

@@ -115,35 +115,20 @@ def wrapped(*args, **kwds):
                     raise NotImplementedError
                 break
 
-        # loop over positional parameters and actual arguments
-        lst, dct = [], {}
-        for arg, (name, parm) in zip(args, sig.parameters.items()):
-            lst.append(normalize_this(arg, parm))
-
-        # normalize keyword arguments
-        for name, arg in kwds.items():
-            if not name in sig.parameters:
-                # unknown kwarg, bail out
-                raise TypeError(
-                    f"{func.__name__}() got an unexpected keyword argument '{name}'."
-                )
-
-            parm = sig.parameters[name]
-            dct[name] = normalize_this(arg, parm)
-
-        ba = sig.bind(*lst, **dct)
-        ba.apply_defaults()
-
-        # Now that all parameters have been consumed, check:
-        # Anything that has not been bound is unexpected positional arg => raise.
-        # If there are too few actual arguments, this fill fail in func(*ba.args) below
-        if len(args) > len(ba.args):
-            raise TypeError(
-                f"{func.__name__}() takes {len(ba.args)} positional argument but {len(args)} were given."
-            )
-
-        # finally, pass normalized arguments through
-        result = func(*ba.args, **ba.kwargs)
+        # normalize positional and keyword arguments
+        # NB: extra unknown arguments: pass through, will raise in func(*lst) below
+        sp = sig.parameters
+
+        lst = [normalize_this(arg, parm) for arg, parm in zip(args, sp.values())]
+        lst += args[len(lst) :]
+
+        dct = {
+            name: normalize_this(arg, sp[name]) if name in sp else arg
+            for name, arg in kwds.items()
+        }
+
+        result = func(*lst, **dct)
+
         return result
 
     return wrapped

torch_np/tests/test_basic.py

@@ -401,6 +401,10 @@ def test_unknown_args(self):
         with assert_raises(TypeError):
             w.nonzero(a, oops="ouch")
 
+    def test_too_few_args_positional(self):
+        with assert_raises(TypeError):
+            w.nonzero()
+
     def test_unknown_args_with_defaults(self):
         # check a function 5 arguments and 4 defaults: this should work
         w.eye(3)