Allow funplex to handle requests to root.

[wrw.git] / wrw / util.py

diff --git a/wrw/util.py b/wrw/util.py
index ed32cc6..7209ae4 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -7,26 +7,20 @@ def wsgiwrap(callable):
     wrapper.__wrapped__ = callable
     return wrapper
 
-def stringwrap(charset):
-    def dec(callable):
-        def wrapper(*args, **kwargs):
-            bk = callable(*args, **kwargs)
-            for string in bk:
-                yield string.encode(charset)
-        return wrapper
-    return dec
-
 def formparams(callable):
+    spec = inspect.getargspec(callable)
     def wrapper(req):
-        data = form.formdata(req)
-        spec = inspect.getargspec(callable)
+        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:
             for arg in list(args):
                 if arg not in spec.args:
                     del args[arg]
-        for i in range(len(spec.args) - len(spec.defaults)):
+        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."))
         return callable(**args)
@@ -47,6 +41,8 @@ class funplex(object):
 
     def __call__(self, req):
         if req.pathinfo == "":
+            if "__root__" in self.dir:
+                return self.dir["__root__"](req)
             raise resp.redirect(req.uriname + "/")
         if req.pathinfo[:1] != "/":
             raise resp.notfound()
@@ -58,7 +54,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):
@@ -71,7 +69,7 @@ class funplex(object):
             return fun
         return dec
 
-def persession(data = None):
+def persession(data=None):
     def dec(callable):
         def wrapper(req):
             sess = session.get(req)
@@ -119,9 +117,19 @@ def pregen(callable):
     wrapper.__wrapped__ = callable
     return wrapper
 
+def stringwrap(charset):
+    def dec(callable):
+        @pregen
+        def wrapper(*args, **kwargs):
+            for string in callable(*args, **kwargs):
+                yield string.encode(charset)
+        wrapper.__wrapped__ = callable
+        return wrapper
+    return dec
+
 class sessiondata(object):
     @classmethod
-    def get(cls, req, create = True):
+    def get(cls, req, create=True):
         sess = cls.sessdb().get(req)
         with sess.lock:
             try:
@@ -266,6 +274,6 @@ class specdirty(sessiondata, metaclass=specclass):
 def datecheck(req, mtime):
     if "If-Modified-Since" in req.ihead:
         rtime = proto.phttpdate(req.ihead["If-Modified-Since"])
-        if rtime >= math.floor(mtime):
+        if rtime is not None and rtime >= math.floor(mtime):
             raise resp.unmodified()
     req.ohead["Last-Modified"] = proto.httpdate(mtime)