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

Merge pull request #2047 from kvanzuijlen/fix_issues_for_python3

Browse Source 
'unique_key' shouldn't be saved as bytes
This commit is contained in:
mdipierro
2018-11-01 08:24:27 -07:00
committed by GitHub
parent 41448926cb ec41d49454
commit bbaf151f25
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/contrib/redis_session.py
+2 -2
View File
@@ -186,8 +186,8 @@ class MockQuery(object):
if rtn: if rtn:
if self.unique_key: if self.unique_key:
# make sure the id and unique_key are correct # make sure the id and unique_key are correct
if rtn[b'unique_key'] == to_bytes(self.unique_key): if rtn['unique_key'] == self.unique_key:
rtn[b'update_record'] = self.update # update record support rtn['update_record'] = self.update # update record support
else: else:
rtn = None rtn = None
return [Storage(rtn)] if rtn else [] return [Storage(rtn)] if rtn else []
gluon/globals.py
+1 -1
View File
@@ -1051,7 +1051,7 @@ class Session(Storage):
if record_id.isdigit() and long(record_id) > 0: if record_id.isdigit() and long(record_id) > 0:
new_unique_key = web2py_uuid() new_unique_key = web2py_uuid()
row = table(record_id) row = table(record_id)
if row and row[b'unique_key'] == to_bytes(unique_key): if row and row['unique_key'] == unique_key:
table._db(table.id == record_id).update(unique_key=new_unique_key) table._db(table.id == record_id).update(unique_key=new_unique_key)
else: else:
record_id = None record_id = None