dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of val == dict()

Browse Source
This commit is contained in:
Ricardo Pedroso
2013-05-18 20:36:53 +01:00
parent 43806a26e7
commit cc3f045efa
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/redis_session.py
+3 -9
View File
@@ -155,11 +155,7 @@ class MockQuery(object):
if self.op == 'eq' and self.field == 'id' and self.value: if self.op == 'eq' and self.field == 'id' and self.value:
#means that someone wants to retrieve the key self.value #means that someone wants to retrieve the key self.value
rtn = self.db.hgetall("%s:%s" % (self.keyprefix, self.value)) rtn = self.db.hgetall("%s:%s" % (self.keyprefix, self.value))
if rtn == dict(): return [Storage(rtn)] if rtn else []
#return an empty resultset for non existing key
return []
else:
return [Storage(rtn)]
elif self.op == 'ge' and self.field == 'id' and self.value == 0: elif self.op == 'ge' and self.field == 'id' and self.value == 0:
#means that someone wants the complete list #means that someone wants the complete list
rtn = [] rtn = []
@@ -168,13 +164,11 @@ class MockQuery(object):
allkeys = self.db.smembers(id_idx) allkeys = self.db.smembers(id_idx)
for sess in allkeys: for sess in allkeys:
val = self.db.hgetall(sess) val = self.db.hgetall(sess)
if val == dict(): if not val:
if self.session_expiry: if self.session_expiry:
#clean up the idx, because the key expired #clean up the idx, because the key expired
self.db.srem(id_idx, sess) self.db.srem(id_idx, sess)
continue continue
else:
continue
val = Storage(val) val = Storage(val)
#add a delete_record method (necessary for sessions2trash.py) #add a delete_record method (necessary for sessions2trash.py)
val.delete_record = RecordDeleter( val.delete_record = RecordDeleter(