X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=b8461d1d10089cc7aa0922004bf993e7b2fcd4ed;hb=c2fc67dcf0d590e029774eb8a7e8de8e22cd4801;hp=db74e623606d9d7f04504f68a0ce05a02ac420b7;hpb=d13a1a574515e4c4a40ed0090c8c684cc9e523f2;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index db74e62..b8461d1 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,10 +1,33 @@
-from . import req, dispatch, session
+import inspect
+from . import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
         return dispatch.handle(req.origrequest(env), startreq, 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):
+    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 +45,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
@@ -42,6 +67,7 @@ class autodirty(sessiondata):
         ret = super().get(req)
         if "_is_dirty" not in ret.__dict__:
             ret.__dict__["_is_dirty"] = False
+        return ret
 
     def sessfrozen(self):
         self.__dict__["_is_dirty"] = False