X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=18e3c973e24a35508af3a34ac6ef780af6fd8f78;hb=0a22b876bbda8fec0e584c37287528c151b81888;hp=dcf745ac88eb2eadf05c0f99ddeeb3f07c96af50;hpb=977d28bdc9a93e9be8ebf29583a03e3dedcd3044;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index dcf745a..18e3c97 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -10,9 +10,14 @@ def wsgiwrap(callable):
 def formparams(callable):
     sig = inspect.signature(callable)
     haskw = inspect.Parameter.VAR_KEYWORD in (par.kind for par in sig.parameters.values())
+
+    def mangle(nm):
+        return nm.replace("-", "_")
+
     def wrapper(req):
         try:
-            data = dict(form.formdata(req).items())
+            data = dict((mangle(key), val) for (key, val)
+                        in form.formdata(req).items())
         except IOError:
             raise resp.httperror(400, "Invalid request", "Form data was incomplete")
         
@@ -25,9 +30,12 @@ def formparams(callable):
                 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