Update __init__.py

This commit is contained in:
Max Zwiessele 2015-10-11 01:57:37 +01:00
parent 0b4297bda5
commit 0d74681ee2

View file

@ -43,19 +43,28 @@ def load(file_or_path):
:param file_name: path/to/file.pickle
"""
try:
str = basestring
except:
pass
try:
import cPickle as pickle
if isinstance(file_or_path, str):
with open(file_or_path, 'rb') as f:
m = pickle.load(f)
unicode = unicode
except NameError:
# 'unicode' is undefined, must be Python 3
str = str
unicode = str
bytes = bytes
basestring = (str,bytes)
else:
# 'unicode' exists, must be Python 2
str = str
unicode = unicode
bytes = str
basestring = basestring try:
import cPickle as pickle
if isinstance(file_or_path, basestring):
with open(file_or_path, 'rb') as f:
m = pickle.load(f)
else:
m = pickle.load(file_or_path)
except:
import pickle
if isinstance(file_or_path, str):
if isinstance(file_or_path, basestring):
with open(file_or_path, 'rb') as f:
m = pickle.load(f)
else: