X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=a1dcc6c8a9fb33e442d0fb2bd4cbdb28cc7a8837;hb=69eb6cbefcf769276e3e15c6f20e9d5af74fd326;hp=557b25d684c8a57e861e479fd3002ce0aaae4fff;hpb=438b6207201da45a2f23e6ff207a61a0f57b20f3;p=wrw.git diff --git a/wrw/util.py b/wrw/util.py index 557b25d..a1dcc6c 100644 --- a/wrw/util.py +++ b/wrw/util.py @@ -10,7 +10,10 @@ def wsgiwrap(callable): def formparams(callable): spec = inspect.getargspec(callable) def wrapper(req): - data = form.formdata(req) + try: + data = form.formdata(req) + except IOError: + raise resp.httperror(400, "Invalid request", "Form data was incomplete") args = dict(data.items()) args["req"] = req if not spec.keywords: @@ -49,7 +52,9 @@ class funplex(object): p = p.partition("/")[0] bi = len(p) + 1 if p in self.dir: - return self.dir[p](req.shift(bi)) + sreq = req.shift(bi) + sreq.selfpath = req.pathinfo[1:] + return self.dir[p](sreq) raise resp.notfound() def add(self, fun):