Transform explicit list conversion of XML list items to xmltodict-based conversion

Author: engelen

openml/evaluations/functions.py

@@ -61,21 +61,17 @@ def _list_evaluations(api_call):
 
     xml_string = _perform_api_call(api_call)
 
-    evals_dict = xmltodict.parse(xml_string)
+    evals_dict = xmltodict.parse(xml_string, force_list=('oml:evaluation',))
     # Minimalistic check if the XML is useful
     if 'oml:evaluations' not in evals_dict:
         raise ValueError('Error in return XML, does not contain "oml:evaluations": %s'
                          % str(evals_dict))
 
-    if isinstance(evals_dict['oml:evaluations']['oml:evaluation'], list):
-        evals_list = evals_dict['oml:evaluations']['oml:evaluation']
-    elif isinstance(evals_dict['oml:evaluations']['oml:evaluation'], dict):
-        evals_list = [evals_dict['oml:evaluations']['oml:evaluation']]
-    else:
-        raise TypeError()
+    assert type(evals_dict['oml:evaluations']['oml:evaluation']) == list, \
+        type(evals_dict['oml:evaluations'])
 
     evals = dict()
-    for eval_ in evals_list:
+    for eval_ in evals_dict['oml:evaluations']['oml:evaluation']:
         run_id = int(eval_['oml:run_id'])
         array_data = None
         if 'oml:array_data' in eval_:

openml/runs/functions.py

@@ -854,7 +854,7 @@ def _list_runs(api_call):
 
     xml_string = _perform_api_call(api_call)
 
-    runs_dict = xmltodict.parse(xml_string)
+    runs_dict = xmltodict.parse(xml_string, force_list=('oml:run',))
     # Minimalistic check if the XML is useful
     if 'oml:runs' not in runs_dict:
         raise ValueError('Error in return XML, does not contain "oml:runs": %s'
@@ -869,15 +869,11 @@ def _list_runs(api_call):
                          '"http://openml.org/openml": %s'
                          % str(runs_dict))
 
-    if isinstance(runs_dict['oml:runs']['oml:run'], list):
-        runs_list = runs_dict['oml:runs']['oml:run']
-    elif isinstance(runs_dict['oml:runs']['oml:run'], dict):
-        runs_list = [runs_dict['oml:runs']['oml:run']]
-    else:
-        raise TypeError()
+    assert type(runs_dict['oml:runs']['oml:run']) == list, \
+        type(runs_dict['oml:runs'])
 
     runs = dict()
-    for run_ in runs_list:
+    for run_ in runs_dict['oml:runs']['oml:run']:
         run_id = int(run_['oml:run_id'])
         run = {'run_id': run_id,
                'task_id': int(run_['oml:task_id']),

openml/setups/functions.py

@@ -116,7 +116,7 @@ def _list_setups(api_call):
 
     xml_string = openml._api_calls._perform_api_call(api_call)
 
-    setups_dict = xmltodict.parse(xml_string)
+    setups_dict = xmltodict.parse(xml_string, force_list=('oml:setup',))
     # Minimalistic check if the XML is useful
     if 'oml:setups' not in setups_dict:
         raise ValueError('Error in return XML, does not contain "oml:setups": %s'
@@ -131,15 +131,11 @@ def _list_setups(api_call):
                          '"http://openml.org/openml": %s'
                          % str(setups_dict))
 
-    if isinstance(setups_dict['oml:setups']['oml:setup'], list):
-        setups_list = setups_dict['oml:setups']['oml:setup']
-    elif isinstance(setups_dict['oml:setups']['oml:setup'], dict):
-        setups_list = [setups_dict['oml:setups']['oml:setup']]
-    else:
-        raise TypeError()
+    assert type(setups_dict['oml:setups']['oml:setup']) == list, \
+        type(setups_dict['oml:setups'])
 
     setups = dict()
-    for setup_ in setups_list:
+    for setup_ in setups_dict['oml:setups']['oml:setup']:
         # making it a dict to give it the right format
         current = _create_setup_from_xml({'oml:setup_parameters': setup_})
         setups[current.setup_id] = current