Various python3 modifications.

[wrw.git] / wrw / session.py

diff --git a/wrw/session.py b/wrw/session.py
index 284d092..b46b818 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,5 +1,5 @@
 import threading, time, pickle, random, os
-import cookie
+from . import cookie
 
 __all__ = ["db", "get"]
 
@@ -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)
@@ -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()
 
@@ -155,14 +154,14 @@ class db(object):
 
 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):