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

py35 fix cacheOnDisk on win

Browse Source
This commit is contained in:
ilvalle
2016-07-04 20:30:50 +02:00
parent d9c2f778ee
commit 61c9b7991e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/cache.py
+3 -3
View File
@@ -40,7 +40,7 @@ try:
except ImportError: except ImportError:
have_settings = False have_settings = False
from gluon._compat import pickle, thread from gluon._compat import pickle, thread, to_bytes, to_native
try: try:
import psutil import psutil
@@ -304,13 +304,13 @@ class CacheOnDisk(CacheAbstract):
Windows doesn't allow \ / : * ? "< > | in filenames. Windows doesn't allow \ / : * ? "< > | in filenames.
To go around this encode the keys with base32. To go around this encode the keys with base32.
""" """
return base64.b32encode(key) return to_native(base64.b32encode(to_bytes(key)))
def key_filter_out_windows(key): def key_filter_out_windows(key):
""" """
We need to decode the keys so regex based removal works. We need to decode the keys so regex based removal works.
""" """
return base64.b32decode(key) return to_native(base64.b32decode(to_bytes(key)))
self.key_filter_in = key_filter_in_windows self.key_filter_in = key_filter_in_windows
self.key_filter_out = key_filter_out_windows self.key_filter_out = key_filter_out_windows