[tools/odmlparser] utf-8 encode on write with py2

Author: mpsonntag

odml/tools/odmlparser.py

@@ -7,6 +7,7 @@
 
 import datetime
 import json
+import sys
 import yaml
 
 from . import xmlparser
@@ -17,6 +18,11 @@
 from .rdf_converter import RDFReader, RDFWriter
 from ..validation import Validation
 
+try:
+    unicode = unicode
+except NameError:
+    unicode = str
+
 
 class ODMLWriter:
     """
@@ -58,7 +64,7 @@ def to_string(self, odml_document):
         string_doc = ''
 
         if self.parser == 'XML':
-            string_doc = str(xmlparser.XMLWriter(odml_document))
+            string_doc = unicode(xmlparser.XMLWriter(odml_document))
         elif self.parser == "RDF":
             # Use turtle as default output format for now.
             string_doc = RDFWriter(odml_document).get_rdf_str("turtle")
@@ -74,6 +80,9 @@ def to_string(self, odml_document):
                 string_doc = json.dumps(odml_output, indent=4,
                                         cls=JSONDateTimeSerializer)
 
+        if sys.version_info.major < 3:
+            string_doc = string_doc.encode("utf-8")
+
         return string_doc