Merge branch 'master' into python2

[wrw.git] / wrw / session.py

diff --git a/wrw/session.py b/wrw/session.py
index d088ad7..71ed2d5 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -11,7 +11,7 @@ def hexencode(str):
 
 def gennonce(length):
     nonce = ""
-    for i in xrange(length):
+    for i in range(length):
         nonce += chr(random.randint(0, 255))
     return nonce
 
@@ -83,7 +83,7 @@ class db(object):
         now = int(time.time())
         with self.lock:
             dlist = []
-            for sess in self.live.itervalues():
+            for sess in self.live.values():
                 if sess.atime + self.freezetime < now:
                     try:
                         if sess.dirty():
@@ -110,6 +110,7 @@ class db(object):
     def fetch(self, req):
         now = int(time.time())
         sessid = cookie.get(req, self.cookiename)
+        new = False
         with self.lock:
             if self.cthread is None:
                 self.cthread = threading.Thread(target = self.cleanloop)
@@ -128,21 +129,20 @@ class db(object):
                 sess.atime = now
             except KeyError:
                 sess = session()
-                self.live[sess.id] = sess
-                sess.new = True
-        req.oncommit(self.ckfreeze)
-        return sess
+                new = True
 
-    def ckfreeze(self, req):
-        sess = req.item(self.fetch)
-        if sess.dirty():
-            try:
-                if getattr(sess, "new", False):
+        def ckfreeze(req):
+            if sess.dirty():
+                if new:
                     cookie.add(req, self.cookiename, sess.id, self.path)
-                    del sess.new
-                self.freeze(sess)
-            except:
-                pass
+                    with self.lock:
+                        self.live[sess.id] = sess
+                try:
+                    self.freeze(sess)
+                except:
+                    pass
+        req.oncommit(ckfreeze)
+        return sess
 
     def thaw(self, sessid):
         raise KeyError()
@@ -150,16 +150,19 @@ class db(object):
     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(backeddb, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
         self.backdb = backdb
 
     def thaw(self, sessid):
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
-        except Exception, e:
+        except:
             raise KeyError()
 
     def freeze(self, sess):
@@ -186,4 +189,4 @@ class dirback(object):
 default = backeddb(dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid()))))
 
 def get(req):
-    return req.item(default.fetch)
+    return default.get(req)