X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsession.py;h=476113ad59f66a0d0ac8f5cad2047e85f1f3902e;hb=b6f62b898efdc272130d3dbdd6742c5b785e7c7d;hp=e7d85817700e755c4869b654526fc349f75cc139;hpb=6afbb1788a98c5707f88b2c6b027b345f3b053f8;p=wrw.git

diff --git a/wrw/session.py b/wrw/session.py
index e7d8581..476113a 100644
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,23 +1,18 @@
 import threading, time, pickle, random, os
-from . import cookie, env
+<<<<<<< HEAD
+import cookie, env
+=======
+from . import cookie, env, proto
+>>>>>>> master
 
 __all__ = ["db", "get"]
 
-def hexencode(str):
-    ret = ""
-    for byte in str:
-        ret += "%02X" % (ord(byte),)
-    return ret
-
 def gennonce(length):
-    nonce = ""
-    for i in range(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))
+        self.id = proto.enhex(gennonce(16))
         self.dict = {}
         self.lock = lock
         self.ctime = self.atime = self.mtime = int(time.time())
@@ -86,7 +81,7 @@ class db(object):
     def clean(self):
         now = int(time.time())
         with self.lock:
-            clist = list(self.live.keys())
+            clist = self.live.keys()
         for sessid in clist:
             with self.lock:
                 try:
@@ -204,7 +199,7 @@ class db(object):
         data = self.backdb[sessid]
         try:
             return pickle.loads(data)
-        except:
+        except Exception, e:
             raise KeyError()
 
     def freeze(self, sess):