[unpickle] with latin1 encoding

This commit is contained in:
mzwiessele 2015-11-05 09:52:27 +00:00
commit 3e0dcf9317

View file

@ -59,11 +59,15 @@ def load(file_or_path):
m = pickle.load(f) m = pickle.load(f)
else: else:
m = pickle.load(file_or_path) m = pickle.load(file_or_path)
except: except: # python3
import pickle import pickle
if isinstance(file_or_path, str): if isinstance(file_or_path, str):
with open(file_or_path, 'rb') as f: with open(file_or_path, 'rb') as f:
m = pickle.load(f) u = pickle._Unpickler(f) # @UndefinedVariable
u.encoding = 'latin1'
m = u.load()
else: else:
m = pickle.load(file_or_path) u = pickle._Unpickler(file_or_path) # @UndefinedVariable
u.encoding = 'latin1'
m = u.load()
return m return m