Update __init__.py

This commit is contained in:
Max Zwiessele 2015-11-04 19:13:44 +00:00
parent d1f4af7ec2
commit 1fe037c5f9

View file

@ -50,11 +50,14 @@ def load(file_or_path):
u.encoding = 'latin1' u.encoding = 'latin1'
m = u.load() m = u.load()
else: else:
m = pickle.load(file_or_path)
except: except:
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)
u.encoding = 'latin1'
m = u.load()
else: else:
m = pickle.load(file_or_path) m = pickle.load(file_or_path)
except ImportError: except ImportError: