Make call_with_args() work with wrapped funcs

Author: linuxdaemon

cloudbot/util/func_utils.py

@@ -4,7 +4,7 @@
 class ParameterError(Exception):
     def __init__(self, name, valid_args):
         super().__init__(
-            "'{}' is not a valid parameter, valid parameters are: {}".format(
+            "{!r} is not a valid parameter, valid parameters are: {}".format(
                 name, list(valid_args)
             )
         )
@@ -13,9 +13,11 @@ def __init__(self, name, valid_args):
 
 
 def call_with_args(func, arg_data):
-    sig = inspect.signature(func)
+    sig = inspect.signature(func, follow_wrapped=False)
     try:
-        args = [arg_data[key] for key in sig.parameters.keys() if not key.startswith('_')]
+        args = [
+            arg_data[key] for key in sig.parameters.keys() if not key.startswith("_")
+        ]
     except KeyError as e:
         raise ParameterError(e.args[0], arg_data.keys()) from e