X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Futil.py;h=58ead25e5f3e17453403167b125e705277675ab6;hb=3614ca8353a5f2055fdcc086e6bc9dc993b49b42;hp=7a29ea8c20571bf0543a17af9f0e57be5554ddeb;hpb=bbdebbab6c98d8611bc8faa197df226d29e4cb2b;p=wrw.git

diff --git a/wrw/util.py b/wrw/util.py
index 7a29ea8..58ead25 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,5 +1,5 @@
 import inspect
-import req, dispatch, session, form
+from . import req, dispatch, session, form
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):
@@ -36,24 +36,26 @@ 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
     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
@@ -65,18 +67,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):