Type check with isinstance instead of type() ==

openml · LennartPurucker · Jan 18, 2024 · Jul 20, 2023 · Aug 1, 2023 · Aug 1, 2023
commit 2801e9d8705fbbe360739dfd49a60a884b9ed2c1
diff --git a/openml/datasets/functions.py b/openml/datasets/functions.py
@@ -192,7 +192,9 @@ def __list_datasets(api_call, output_format="dict"):
     datasets_dict = xmltodict.parse(xml_string, force_list=("oml:dataset",))
 
     # Minimalistic check if the XML is useful
-    assert type(datasets_dict["oml:data"]["oml:dataset"]) == list, type(datasets_dict["oml:data"])
+    assert isinstance(datasets_dict["oml:data"]["oml:dataset"], list), type(
+        datasets_dict["oml:data"]
+    )
     assert datasets_dict["oml:data"]["@xmlns:oml"] == "http://openml.org/openml", datasets_dict[
         "oml:data"
     ]["@xmlns:oml"]

diff --git a/openml/evaluations/functions.py b/openml/evaluations/functions.py
@@ -197,7 +197,7 @@ def __list_evaluations(api_call, output_format="object"):
             "Error in return XML, does not contain " '"oml:evaluations": %s' % str(evals_dict)
         )
 
-    assert type(evals_dict["oml:evaluations"]["oml:evaluation"]) == list, type(
+    assert isinstance(evals_dict["oml:evaluations"]["oml:evaluation"], list), type(
         evals_dict["oml:evaluations"]
     )
 

diff --git a/openml/flows/functions.py b/openml/flows/functions.py
@@ -341,7 +341,7 @@ def __list_flows(api_call: str, output_format: str = "dict") -> Union[Dict, pd.D
     flows_dict = xmltodict.parse(xml_string, force_list=("oml:flow",))
 
     # Minimalistic check if the XML is useful
-    assert type(flows_dict["oml:flows"]["oml:flow"]) == list, type(flows_dict["oml:flows"])
+    assert isinstance(flows_dict["oml:flows"]["oml:flow"], list), type(flows_dict["oml:flows"])
     assert flows_dict["oml:flows"]["@xmlns:oml"] == "http://openml.org/openml", flows_dict[
         "oml:flows"
     ]["@xmlns:oml"]

diff --git a/openml/runs/functions.py b/openml/runs/functions.py
@@ -1139,7 +1139,7 @@ def __list_runs(api_call, output_format="dict"):
             '"http://openml.org/openml": %s' % str(runs_dict)
         )
 
-    assert type(runs_dict["oml:runs"]["oml:run"]) == list, type(runs_dict["oml:runs"])
+    assert isinstance(runs_dict["oml:runs"]["oml:run"], list), type(runs_dict["oml:runs"])
 
     runs = OrderedDict()
     for run_ in runs_dict["oml:runs"]["oml:run"]:

diff --git a/openml/setups/functions.py b/openml/setups/functions.py
@@ -220,7 +220,7 @@ def __list_setups(api_call, output_format="object"):
             '"%s": %s' % (openml_uri, str(setups_dict))
         )
 
-    assert type(setups_dict["oml:setups"]["oml:setup"]) == list, type(setups_dict["oml:setups"])
+    assert isinstance(setups_dict["oml:setups"]["oml:setup"], list), type(setups_dict["oml:setups"])
 
     setups = dict()
     for setup_ in setups_dict["oml:setups"]["oml:setup"]:

diff --git a/openml/study/functions.py b/openml/study/functions.py
@@ -595,7 +595,7 @@ def __list_studies(api_call, output_format="object") -> Union[Dict, pd.DataFrame
     study_dict = xmltodict.parse(xml_string, force_list=("oml:study",))
 
     # Minimalistic check if the XML is useful
-    assert type(study_dict["oml:study_list"]["oml:study"]) == list, type(
+    assert isinstance(study_dict["oml:study_list"]["oml:study"], list), type(
         study_dict["oml:study_list"]
     )
     assert study_dict["oml:study_list"]["@xmlns:oml"] == "http://openml.org/openml", study_dict[

diff --git a/openml/tasks/functions.py b/openml/tasks/functions.py
@@ -246,7 +246,7 @@ def __list_tasks(api_call, output_format="dict"):
             '"http://openml.org/openml": %s' % str(tasks_dict)
         )
 
-    assert type(tasks_dict["oml:tasks"]["oml:task"]) == list, type(tasks_dict["oml:tasks"])
+    assert isinstance(tasks_dict["oml:tasks"]["oml:task"], list), type(tasks_dict["oml:tasks"])
 
     tasks = dict()
     procs = _get_estimation_procedure_list()

diff --git a/openml/tasks/split.py b/openml/tasks/split.py
@@ -43,7 +43,7 @@ def __init__(self, name, description, split):
 
     def __eq__(self, other):
         if (
- type(self) != type(other)
+ (not isinstance(self, type(other)))
             or self.name != other.name
             or self.description != other.description
             or self.split.keys() != other.split.keys()

diff --git a/tests/test_runs/test_run_functions.py b/tests/test_runs/test_run_functions.py
@@ -150,7 +150,7 @@ def _assert_predictions_equal(self, predictions, predictions_prime):
             for col_idx in compare_slice:
                 val_1 = predictions["data"][idx][col_idx]
                 val_2 = predictions_prime["data"][idx][col_idx]
-                if type(val_1) == float or type(val_2) == float:
+                if isinstance(val_1, float) or isinstance(val_2, float):
                     self.assertAlmostEqual(
                         float(val_1),
                         float(val_2),