Merge pull request #1260 from Cadair/quantity_decorator

var args fix for unit decorator
sunpy · Jan 23, 2015 · c2e18bc · c2e18bc
2 parents 754a015 + c582030
commit c2e18bc
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sunpy/util/unit_decorators.py b/sunpy/util/unit_decorators.py
@@ -75,6 +75,11 @@ def wrapper(*func_args, **func_kwargs):
 
             # Iterate through the parameters of the original signature
             for param in wrapped_signature.parameters.values():
+                 # We do not support variable arguments (*args,
+                 # **kwargs)
+                if param.kind in (funcsigs.Parameter.VAR_KEYWORD,
+                                  funcsigs.Parameter.VAR_POSITIONAL):
+                    continue
                 # Catch the (never triggered) case where bind relied on a default value.
                 if param.name not in bound_args.arguments and param.default is not param.empty:
                     bound_args.arguments[param.name] = param.default