Rewrite load/save to use generic reader/writer

Author: achilleas-k

odml/fileio.py

@@ -1,34 +1,18 @@
-import odml.tools.xmlparser as xml
-import odml.tools.jsonparser as json
+from .tools.odmlparser import ODMLReader, ODMLWriter
 
-parsers = ["xml", "json"]
+parsers = ["xml", "json", "yaml"]
 
 
 def load(filename, backend="xml"):
-    if backend in parsers:
-        if backend == "xml":
-            return xml.load(filename)
-        elif backend == "json":
-            return json.JSONReader().fromFile(open(filename))
-    else:
-        raise ValueError("No such parser")
+    reader = ODMLReader(backend)
+    return reader.fromFile(filename)
 
 
 def save(obj, filename, backend="xml"):
-    if backend in parsers:
-        if backend == "xml":
-            xml.XMLWriter(obj).write_file(filename)
-        elif backend == "json":
-            json.JSONWriter(obj).write_file(filename)
-    else:
-        raise ValueError("No such parser")
+    writer = ODMLWriter(backend)
+    return writer.write_file(obj, filename)
 
 
 def display(obj, backend="xml"):
-    if backend in parsers:
-        if backend == "xml":
-            print(str(xml.XMLWriter(obj)))
-        elif backend == "json":
-            print(str(json.JSONWriter(obj)))
-    else:
-        raise ValueError("No such parser")
+    # needs to be handled through the generic ODMLWriter
+    pass

odml/tools/odmlparser.py

@@ -9,7 +9,7 @@
 
 import yaml
 import json
-from odml import format
+from .. import format
 from . import xmlparser
 
 # FIX ME: Version should not be hardcoded here. Import from odML module after