X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=wrw%2Futil.py;h=6fa4155b6a423e0cc9f7501d1461df3fad76f806;hb=HEAD;hp=b4e5b284188f740800cb33cd61ac1d29b01902f1;hpb=4d7795d9df82a23aff768ec8a679d340eb0ce058;p=wrw.git diff --git a/wrw/util.py b/wrw/util.py index b4e5b28..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(spec.args[i]), "' is required but not supplied.")) + 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