X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=7459b6d48a4ff05012060a4e40b3385f6ff70e3b;hb=b339a6776813c92c27e40ec5477d7fe5c3bd38bc;hp=e601be39aeef1fc7634cfb29427e9f96ba8f095d;hpb=0f18b7748229b3b899cbc9b7b320d10cd5a668ed;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index e601be3..7459b6d 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -8,27 +8,35 @@ def wsgiwrap(callable):
     return wrapper
 
 def formparams(callable):
+    spec = inspect.getargspec(callable)
     def wrapper(req):
         data = form.formdata(req)
-        spec = inspect.getargspec(callable)
         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 xrange(len(spec.args) - len(spec.defaults)):
+        for i in xrange(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)
     wrapper.__wrapped__ = callable
     return wrapper
 
-def funplex(*funs, **nfuns):
-    dir = {}
-    dir.update(((fun.__name__, fun) for fun in funs))
-    dir.update(nfuns)
-    def handler(req):
+class funplex(object):
+    def __init__(self, *funs, **nfuns):
+        self.dir = {}
+        self.dir.update(((self.unwrap(fun).__name__, fun) for fun in funs))
+        self.dir.update(nfuns)
+
+    @staticmethod
+    def unwrap(fun):
+        while hasattr(fun, "__wrapped__"):
+            fun = fun.__wrapped__
+        return fun
+
+    def __call__(self, req):
         if req.pathinfo == "":
             raise resp.redirect(req.uriname + "/")
         if req.pathinfo[:1] != "/":
@@ -40,12 +48,21 @@ def funplex(*funs, **nfuns):
         else:
             p = p.partition("/")[0]
             bi = len(p) + 1
-        if p in dir:
-            return dir[p](req.shift(bi))
+        if p in self.dir:
+            return self.dir[p](req.shift(bi))
         raise resp.notfound()
-    return handler
 
-def persession(data = None):
+    def add(self, fun):
+        self.dir[self.unwrap(fun).__name__] = fun
+        return fun
+
+    def name(self, name):
+        def dec(fun):
+            self.dir[name] = fun
+            return fun
+        return dec
+
+def persession(data=None):
     def dec(callable):
         def wrapper(req):
             sess = session.get(req)
@@ -95,7 +112,7 @@ def pregen(callable):
 
 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: