X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=814182759d584e30e5aff52df6c7781815e74458;hb=5afb31180662cfaf123ae6155a832470c7c6dce2;hp=43b9087784e1f0fb5e162f862b6429ae3f76c428;hpb=7be9e8bb560cd4e969992759bbcb523b40e544af;p=wrw.git

diff --git a/wrw/session.py b/wrw/session.py
index 43b9087..8141827 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,23 +1,14 @@
 import threading, time, pickle, random, os
-import cookie, env
+from . import cookie, env, proto
 
 __all__ = ["db", "get"]
 
-def hexencode(str):
-    ret = ""
-    for byte in str:
-        ret += "%02X" % (ord(byte),)
-    return ret
-
 def gennonce(length):
-    nonce = ""
-    for i in xrange(length):
-        nonce += chr(random.randint(0, 255))
-    return nonce
+    return os.urandom(length)
 
 class session(object):
-    def __init__(self, lock, expire = 86400 * 7):
-        self.id = hexencode(gennonce(16))
+    def __init__(self, lock, expire=86400 * 7):
+        self.id = proto.enhex(gennonce(16))
         self.dict = {}
         self.lock = lock
         self.ctime = self.atime = self.mtime = int(time.time())
@@ -39,7 +30,7 @@ class session(object):
     def __getitem__(self, key):
         return self.dict[key]
 
-    def get(self, key, default = None):
+    def get(self, key, default=None):
         return self.dict.get(key, default)
 
     def __setitem__(self, key, value):
@@ -74,7 +65,7 @@ class session(object):
         return "<session %s>" % self.id
 
 class db(object):
-    def __init__(self, backdb = None, cookiename = "wrwsess", path = "/"):
+    def __init__(self, backdb=None, cookiename="wrwsess", path="/"):
         self.live = {}
         self.cookiename = cookiename
         self.path = path
@@ -86,7 +77,7 @@ class db(object):
     def clean(self):
         now = int(time.time())
         with self.lock:
-            clist = self.live.keys()
+            clist = list(self.live.keys())
         for sessid in clist:
             with self.lock:
                 try:
@@ -204,7 +195,7 @@ class db(object):
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
-        except Exception, e:
+        except:
             raise KeyError()
 
     def freeze(self, sess):
@@ -235,7 +226,7 @@ class dirback(object):
         with open(os.path.join(self.path, key), "w") as out:
             out.write(value)
 
-default = env.var(db(backdb = dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid())))))
+default = env.var(db(backdb=dirback(os.path.join("/tmp", "wrwsess-" + str(os.getuid())))))
 
 def get(req):
     return default.val.get(req)