Merge branch 'master' into python2

[wrw.git] / wrw / session.py

diff --git a/wrw/session.py b/wrw/session.py
index 8141827..476113a 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,5 +1,9 @@
 import threading, time, pickle, random, os
+<<<<<<< HEAD
+import cookie, env
+=======
 from . import cookie, env, proto
+>>>>>>> master
 
 __all__ = ["db", "get"]
 
@@ -77,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:
@@ -195,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):