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

diff --git a/wrw/util.py b/wrw/util.py
index 6170c9e..c8b7b2c 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,11 +1,20 @@
 import inspect
-import req, dispatch, session, form
+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)
@@ -44,7 +53,7 @@ class sessiondata(object):
             except KeyError:
                 if not create:
                     return None
-                ret = cls(req)
+                ret = cls(req, sess)
                 sess[cls] = ret
                 return ret
 
@@ -55,7 +64,7 @@ class sessiondata(object):
 class autodirty(sessiondata):
     @classmethod
     def get(cls, req):
-        ret = super(autodirty, cls).get(req)
+        ret = super().get(req)
         if "_is_dirty" not in ret.__dict__:
             ret.__dict__["_is_dirty"] = False
         return ret
@@ -67,18 +76,18 @@ class autodirty(sessiondata):
         return self._is_dirty
 
     def __setattr__(self, name, value):
-        super(autodirty, self).__setattr__(name, value)
+        super().__setattr__(name, value)
         if "_is_dirty" in self.__dict__:
             self.__dict__["_is_dirty"] = True
 
     def __delattr__(self, name):
-        super(autodirty, self).__delattr__(name, value)
+        super().__delattr__(name, value)
         if "_is_dirty" in self.__dict__:
             self.__dict__["_is_dirty"] = True
 
 class manudirty(object):
     def __init__(self, *args, **kwargs):
-        super(manudirty, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.__dirty = False
 
     def sessfrozen(self):