import threading, time, pickle, random, os
-import cookie, env
+from . import cookie, env
__all__ = ["db", "get"]
def gennonce(length):
nonce = ""
- for i in xrange(length):
+ for i in range(length):
nonce += chr(random.randint(0, 255))
return nonce
class session(object):
- def __init__(self, lock, expire = 86400 * 7):
+ def __init__(self, lock, expire=86400 * 7):
self.id = hexencode(gennonce(16))
self.dict = {}
self.lock = lock
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):
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
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:
return session(threading.RLock())
def mkcookie(self, req, sess):
- cookie.add(req, self.cookiename, sess.id, path=self.path)
+ cookie.add(req, self.cookiename, sess.id,
+ path=self.path,
+ expires=cookie.cdate(time.time() + sess.expire))
def fetch(self, req):
now = int(time.time())
data = self.backdb[sessid]
try:
return pickle.loads(data)
- except Exception, e:
+ except:
raise KeyError()
def freeze(self, sess):
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)