More python2/python3 simplification

Author: mfeurer

openml/_api_calls.py

@@ -1,8 +1,9 @@
 import io
 import os
 import requests
-import arff
 import warnings
+
+import arff
 import xmltodict
 
 from . import config

openml/config.py

@@ -1,9 +1,10 @@
 """
 Stores module level information like the API key, cache directory and the server.
 """
+import logging
 import os
 import sys
-import logging
+
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(

openml/datasets/dataset.py

@@ -9,20 +9,11 @@
 
 import numpy as np
 import scipy.sparse
+from six.moves import cPickle as pickle
 import xmltodict
 
 from .data_feature import OpenMLDataFeature
 from ..exceptions import PyOpenMLError
-
-if sys.version_info[0] >= 3:
-    import pickle
-else:
-    try:
-        import cPickle as pickle
-    except:
-        import pickle
-
-
 from .._api_calls import _perform_api_call
 
 logger = logging.getLogger(__name__)

openml/datasets/functions.py

@@ -1,9 +1,11 @@
+from collections import OrderedDict
 import io
 import os
 import re
 import shutil
-from collections import OrderedDict
+
 import xmltodict
+
 from .dataset import OpenMLDataset
 from ..exceptions import OpenMLCacheException
 from .. import config

openml/setups/functions.py

@@ -1,10 +1,11 @@
+from collections import OrderedDict
+
 import openml
 import xmltodict
-import copy
 
-from collections import OrderedDict
 from .setup import OpenMLSetup, OpenMLParameter
 
+
 def setup_exists(downloaded_flow, sklearn_model):
     '''
     Checks whether a flow / hyperparameter configuration already exists on the server

openml/tasks/functions.py

@@ -1,7 +1,8 @@
+from collections import OrderedDict
 import io
-import os
 import re
-from collections import OrderedDict
+import os
+
 import xmltodict
 
 from ..exceptions import OpenMLCacheException

openml/tasks/split.py

@@ -1,16 +1,10 @@
 from collections import namedtuple, OrderedDict
 import os
 import sys
+
 import numpy as np
 import scipy.io.arff
-
-if sys.version_info[0] > 3:
-    import pickle
-else:
-    try:
-        import cPickle as pickle
-    except:
-        import pickle
+from six.moves import cPickle as pickle
 
 
 Split = namedtuple("Split", ["train", "test"])

openml/testing.py

@@ -1,9 +1,10 @@
 import hashlib
 import inspect
 import os
-import time
 import shutil
+import time
 import unittest
+
 import openml