X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=6170c9e455aaf26fd97cc84d047dcfe7633e165d;hb=1f61bf3134f3b46954ad012096c6ff3b398a74ef;hp=86a7eabb8b6251b83698d6b43810dab8141d1505;hpb=617b21dfdf0df93c3431e41b0df0cb87f4d11585;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index 86a7eab..6170c9e 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,10 +1,24 @@
-import req, dispatch, session
+import inspect
+import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
         return dispatch.handle(req.origrequest(env), startreq, callable)
     return wrapper
 
+def formparams(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]
+        return callable(**args)
+    return wrapper
+
 def persession(data = None):
     def dec(callable):
         def wrapper(req):
@@ -22,19 +36,21 @@ def persession(data = None):
 
 class sessiondata(object):
     @classmethod
-    def get(cls, req):
+    def get(cls, req, create = True):
         sess = cls.sessdb().get(req)
         with sess.lock:
             try:
                 return sess[cls]
             except KeyError:
+                if not create:
+                    return None
                 ret = cls(req)
                 sess[cls] = ret
                 return ret
 
     @classmethod
     def sessdb(cls):
-        return session.default
+        return session.default.val
 
 class autodirty(sessiondata):
     @classmethod