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

Revert "convert session to dict before pickling"

Browse Source 
This reverts commit 36303e338d.
This commit is contained in:
Leonel Câmara
2014-02-25 12:54:31 +00:00
parent 752a1c7df6
commit d01add8f2b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/globals.py
+4 -4
View File
@@ -878,7 +878,7 @@ class Session(Storage):
response.cookies[response.session_id_name]['expires'] = \ response.cookies[response.session_id_name]['expires'] = \
cookie_expires.strftime(FMT) cookie_expires.strftime(FMT)
session_pickled = cPickle.dumps(dict(self)) session_pickled = cPickle.dumps(self)
response.session_hash = hashlib.md5(session_pickled).hexdigest() response.session_hash = hashlib.md5(session_pickled).hexdigest()
if self.flash: if self.flash:
@@ -1038,7 +1038,7 @@ class Session(Storage):
return True return True
def _unchanged(self,response): def _unchanged(self,response):
session_pickled = cPickle.dumps(dict(self)) session_pickled = cPickle.dumps(self)
response.session_pickled = session_pickled response.session_pickled = session_pickled
session_hash = hashlib.md5(session_pickled).hexdigest() session_hash = hashlib.md5(session_pickled).hexdigest()
return response.session_hash == session_hash return response.session_hash == session_hash
@@ -1065,7 +1065,7 @@ class Session(Storage):
else: else:
unique_key = response.session_db_unique_key unique_key = response.session_db_unique_key
session_pickled = response.session_pickled or cPickle.dumps(dict(self)) session_pickled = response.session_pickled or cPickle.dumps(self)
dd = dict(locked=False, dd = dict(locked=False,
client_ip=response.session_client, client_ip=response.session_client,
@@ -1105,7 +1105,7 @@ class Session(Storage):
portalocker.lock(response.session_file, portalocker.LOCK_EX) portalocker.lock(response.session_file, portalocker.LOCK_EX)
response.session_locked = True response.session_locked = True
if response.session_file: if response.session_file:
session_pickled = response.session_pickled or cPickle.dumps(dict(self)) session_pickled = response.session_pickled or cPickle.dumps(self)
response.session_file.write(session_pickled) response.session_file.write(session_pickled)
response.session_file.truncate() response.session_file.truncate()
finally: finally: