MAINT fix 2/3 compability issue

Author: mfeurer

tests/test_flows/test_flow_functions.py

@@ -17,11 +17,11 @@ def _check_flow(self, flow):
         self.assertTrue(is_string(flow['external_version']) or
                         flow['external_version'] is None)
 
-    def test_list_datasets(self):
+    def test_list_flows(self):
         # We can only perform a smoke test here because we test on dynamic
         # data from the internet...
         flows = openml.flows.list_flows()
-        # 3000 as the number of datasets on openml.org
+        # 3000 as the number of flows on openml.org
         self.assertGreaterEqual(len(flows), 3000)
         for fid in flows:
             self._check_flow(flows[fid])

tests/test_flows/test_sklearn.py

@@ -3,7 +3,11 @@
 import os
 import sys
 import unittest
-import unittest.mock
+
+if sys.version_info[0] >= 3:
+    from unittest import mock
+else:
+    import mock
 
 import numpy as np
 import scipy.optimize
@@ -49,7 +53,7 @@ def setUp(self):
         self.X = iris.data
         self.y = iris.target
 
-    @unittest.mock.patch('openml.flows.sklearn_converter._check_dependencies')
+    @mock.patch('openml.flows.sklearn_converter._check_dependencies')
     def test_serialize_model(self, check_dependencies_mock):
         model = sklearn.tree.DecisionTreeClassifier(criterion='entropy',
                                                     max_features='auto',