From d1f4af7ec2f46ed945929c639d21ed6a60ffc282 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 4 Nov 2015 19:10:57 +0000 Subject: [PATCH 1/3] Update __init__.py --- GPy/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/GPy/__init__.py b/GPy/__init__.py index d044b2c0..62cb7726 100644 --- a/GPy/__init__.py +++ b/GPy/__init__.py @@ -46,9 +46,10 @@ def load(file_or_path): import cPickle as pickle if isinstance(file_or_path, basestring): with open(file_or_path, 'rb') as f: - m = pickle.load(f) + u = pickle._Unpickler(f) + u.encoding = 'latin1' + m = u.load() else: - m = pickle.load(file_or_path) except: import pickle if isinstance(file_or_path, str): From 1fe037c5f94c15233b2d75fc549a527b854af80a Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 4 Nov 2015 19:13:44 +0000 Subject: [PATCH 2/3] Update __init__.py --- GPy/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/GPy/__init__.py b/GPy/__init__.py index 62cb7726..9fb75c9a 100644 --- a/GPy/__init__.py +++ b/GPy/__init__.py @@ -50,11 +50,14 @@ def load(file_or_path): u.encoding = 'latin1' m = u.load() else: + m = pickle.load(file_or_path) except: import pickle if isinstance(file_or_path, str): with open(file_or_path, 'rb') as f: - m = pickle.load(f) + u = pickle._Unpickler(f) + u.encoding = 'latin1' + m = u.load() else: m = pickle.load(file_or_path) except ImportError: From eda71a2cc12ca58254f5fb3de5d181ec210edc65 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Wed, 4 Nov 2015 19:24:25 +0000 Subject: [PATCH 3/3] Update __init__.py --- GPy/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/GPy/__init__.py b/GPy/__init__.py index 9fb75c9a..c2b83a70 100644 --- a/GPy/__init__.py +++ b/GPy/__init__.py @@ -55,9 +55,7 @@ def load(file_or_path): import pickle if isinstance(file_or_path, str): with open(file_or_path, 'rb') as f: - u = pickle._Unpickler(f) - u.encoding = 'latin1' - m = u.load() + m = pickle.load(f) else: m = pickle.load(file_or_path) except ImportError: