FIX work around missing JSONDecodeError in python 2.7/3.4

Author: mfeurer

openml/flows/sklearn.py openml/flows/sklearn_converter.pyopenml/flows/sklearn.py renamed to openml/flows/sklearn_converter.py

@@ -5,6 +5,7 @@
 import json.decoder
 import six
 import warnings
+import sys
 
 import numpy as np
 import scipy.stats.distributions
@@ -19,6 +20,12 @@
 MAXIMAL_FLOW_LENGTH = 1024
 
 
+if sys.version_info >= (3, 5):
+    from json.decoder import JSONDecodeError
+else:
+    JSONDecodeError = ValueError
+
+
 class SklearnToFlowConverter(object):
 
     def serialize_object(self, o):
@@ -92,7 +99,7 @@ def deserialize_object(self, o, **kwargs):
         if isinstance(o, six.string_types):
             try:
                 o = json.loads(o)
-            except json.decoder.JSONDecodeError:
+            except JSONDecodeError:
                 pass
 
         if isinstance(o, dict):

openml/runs/functions.py

@@ -5,7 +5,7 @@
 
 from .. import config
 from ..flows import create_flow_from_model
-from ..flows.sklearn import SklearnToFlowConverter
+from ..flows.sklearn_converter import SklearnToFlowConverter
 from ..exceptions import OpenMLCacheException
 from ..util import URLError
 from ..tasks.functions import _create_task_from_xml

tests/flows/test_flow.py

@@ -17,7 +17,7 @@
 from openml.testing import TestBase
 from openml._api_calls import _perform_api_call
 import openml
-from openml.flows.sklearn import SklearnToFlowConverter
+from openml.flows.sklearn_converter import SklearnToFlowConverter
 
 if sys.version_info[0] >= 3:
     from unittest import mock

tests/flows/test_sklearn.py

@@ -15,7 +15,7 @@
 import sklearn.preprocessing
 import sklearn.tree
 
-from openml.flows.sklearn import SklearnToFlowConverter
+from openml.flows.sklearn_converter import SklearnToFlowConverter
 from openml.flows import OpenMLFlow