From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 1 Jan 2012 21:42:41 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=f593b3dbae242213fa6ea3e1b11310fe15d6ddad;hp=ca6fd155fd1cf58241c9d136977c2fd08948b51b

Merge branch 'master' into python3

Conflicts:
	wrw/session.py
---

diff --git a/wrw/session.py b/wrw/session.py
index 71ed2d5..d78c43b 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -71,13 +71,14 @@ class session(object):
         self.lock = threading.Lock()
 
 class db(object):
-    def __init__(self, cookiename = "wrwsess", path = "/"):
+    def __init__(self, backdb = None, cookiename = "wrwsess", path = "/"):
         self.live = {}
         self.cookiename = cookiename
         self.path = path
         self.lock = threading.Lock()
         self.cthread = None
         self.freezetime = 3600
+        self.backdb = backdb
 
     def clean(self):
         now = int(time.time())
@@ -145,20 +146,8 @@ class db(object):
         return sess
 
     def thaw(self, sessid):
-        raise KeyError()
-
-    def freeze(self, sess):
-        raise TypeError()
-
-    def get(self, req):
-        return req.item(self.fetch)
-
-class backeddb(db):
-    def __init__(self, backdb, *args, **kw):
-        super().__init__(*args, **kw)
-        self.backdb = backdb
-
-    def thaw(self, sessid):
+        if self.backdb is None:
+            raise KeyError()
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
@@ -166,9 +155,14 @@ class backeddb(db):
             raise KeyError()
 
     def freeze(self, sess):
-        self.backdb[sess.id] = pickle.dumps(sess)
+        if self.backdb is None:
+            raise TypeError()
+        self.backdb[sess.id] = pickle.dumps(sess, -1)
         sess.frozen()
 
+    def get(self, req):
+        return req.item(self.fetch)
+
 class dirback(object):
     def __init__(self, path):
         self.path = path
@@ -186,7 +180,7 @@ class dirback(object):
         with open(os.path.join(self.path, key), "w") as out:
             out.write(value)
 
-default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
+default = db(backdb = dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
 
 def get(req):
     return default.get(req)
diff --git a/wrw/util.py b/wrw/util.py
index 35cd3ae..e338e2c 100644
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -36,12 +36,14 @@ 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