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

fixed hashlib_md5 again, thanks Paolo

Browse Source
This commit is contained in:
mdipierro
2017-07-10 15:10:16 -05:00
parent 4854b84ff9
commit ca1e5156ba
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
@@ -14,7 +14,7 @@ Contains the classes for the global used variables:
""" """
from gluon._compat import pickle, StringIO, copyreg, Cookie, urlparse, PY2, iteritems, to_unicode, to_native, \ from gluon._compat import pickle, StringIO, copyreg, Cookie, urlparse, PY2, iteritems, to_unicode, to_native, \
unicodeT, long unicodeT, long, hashlib_md5
from gluon.storage import Storage, List from gluon.storage import Storage, List
from gluon.streamer import streamer, stream_file_or_304_or_206, DEFAULT_CHUNK_SIZE from gluon.streamer import streamer, stream_file_or_304_or_206, DEFAULT_CHUNK_SIZE
from gluon.contenttype import contenttype from gluon.contenttype import contenttype
@@ -487,7 +487,7 @@ class Response(Storage):
if have_minify and ((self.optimize_css and has_css) or (self.optimize_js and has_js)): if have_minify and ((self.optimize_css and has_css) or (self.optimize_js and has_js)):
# cache for 5 minutes by default # cache for 5 minutes by default
key = hashlib.md5(repr(files)).hexdigest() key = hashlib_md5(repr(files)).hexdigest()
cache = self.cache_includes or (current.cache.ram, 60 * 5) cache = self.cache_includes or (current.cache.ram, 60 * 5)
def call_minify(files=files): def call_minify(files=files):
@@ -954,7 +954,7 @@ class Session(Storage):
cookie_expires.strftime(FMT) cookie_expires.strftime(FMT)
session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL)
response.session_hash = hashlib.md5(session_pickled).hexdigest() response.session_hash = hashlib_md5(session_pickled).hexdigest()
if self.flash: if self.flash:
(response.flash, self.flash) = (self.flash, None) (response.flash, self.flash) = (self.flash, None)
@@ -1141,7 +1141,7 @@ class Session(Storage):
return True return True
session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL) session_pickled = pickle.dumps(self, pickle.HIGHEST_PROTOCOL)
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
def _try_store_in_db(self, request, response): def _try_store_in_db(self, request, response):