X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=22bce9de3cdc0f3df5f2ca63988516bd1c9dd3a1;hb=refs%2Fheads%2Fpython2;hp=f70680e752ea95e77d0f04ca043d4fd777a56b08;hpb=0d4c1b8b8da9e20c4bc9fb41ff1136283821b98e;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index f70680e..22bce9d 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):