From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Thu, 1 Dec 2011 20:33:32 +0000 (+0100)
Subject: Tidied up sessions' freezechecking.
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=e70341b29473cc8ceb48089991f165cbad7a6ece

Tidied up sessions' freezechecking.
---

diff --git a/wrw/session.py b/wrw/session.py
index 284d092..2abe650 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -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)
@@ -129,21 +130,19 @@ class db(object):
             except KeyError:
                 sess = session()
                 self.live[sess.id] = sess
-                sess.new = True
-        req.oncommit(self.ckfreeze)
+                new = True
+
+        def ckfreeze(req):
+            if sess.dirty():
+                try:
+                    if new:
+                        cookie.add(req, self.cookiename, sess.id, self.path)
+                    self.freeze(sess)
+                except:
+                    pass
+        req.oncommit(ckfreeze)
         return sess
 
-    def ckfreeze(self, req):
-        sess = self.get(req)
-        if sess.dirty():
-            try:
-                if getattr(sess, "new", False):
-                    cookie.add(req, self.cookiename, sess.id, self.path)
-                    del sess.new
-                self.freeze(sess)
-            except:
-                pass
-
     def thaw(self, sessid):
         raise KeyError()