X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Futil.py;h=6fa4155b6a423e0cc9f7501d1461df3fad76f806;hp=7209ae42d9d96bc39f1b01594b49d1d4afb3db2b;hb=HEAD;hpb=6a9037cbbdde6ac644683096f8b0b0e53a678b3e

diff --git a/wrw/util.py b/wrw/util.py
index 7209ae4..6fa4155 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -8,21 +8,27 @@ def wsgiwrap(callable):
     return wrapper
 
 def formparams(callable):
-    spec = inspect.getargspec(callable)
+    sig = inspect.signature(callable)
+    haskw = inspect.Parameter.VAR_KEYWORD in (par.kind for par in sig.parameters.values())
     def wrapper(req):
         try:
-            data = form.formdata(req)
+            data = dict(form.formdata(req).items())
         except IOError:
             raise resp.httperror(400, "Invalid request", "Form data was incomplete")
-        args = dict(data.items())
-        args["req"] = req
-        if not spec.keywords:
-            for arg in list(args):
-                if arg not in spec.args:
-                    del args[arg]
-        for i in range(len(spec.args) - (len(spec.defaults) if spec.defaults else 0)):
-            if spec.args[i] not in args:
-                raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
+        
+        data["req"] = req
+        if haskw:
+            args = data
+        else:
+            args = {}
+            for par in sig.parameters.values():
+                if par.name in data:
+                    args[par.name] = data[par.name]
+        for par in sig.parameters.values():
+            if par.kind is inspect.Parameter.VAR_KEYWORD:
+                continue
+            if par.default is inspect.Parameter.empty and par.name not in args:
+                raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(par.name), "' is required but not supplied."))
         return callable(**args)
     wrapper.__wrapped__ = callable
     return wrapper