Remove py2 specific encode usage

Author: mpsonntag

odml/property.py

@@ -43,9 +43,6 @@ def odml_tuple_import(t_count, new_value):
                     n_val_str += str(tuple_val) + "; "
                 return_value += [n_val_str[:-2] + ")"]
         else:
-            # non-unicode handling needed for python2
-            # if len(n_val) != 1 and not isinstance(n_val[0], unicode):
-            #    n_val = n_val.encode('utf-8')
             cln = n_val.strip()
             br_check = cln.count("(") == cln.count(")")
             sep_check = t_count == 1 or cln.count("(") == (cln.count(";") / (t_count - 1))

odml/tools/converters/version_converter.py

@@ -518,8 +518,6 @@ def write_to_file(self, filename, backend="XML"):
         :param backend: Format of the source file, default is XML.
         """
         data = self.convert(backend)
-        if sys.version_info < (3,):
-            data = data.encode('utf-8')
 
         ext = [".xml", ".odml"]
         if not filename.endswith(tuple(ext)):

odml/tools/odmlparser.py

@@ -124,9 +124,6 @@ def to_string(self, odml_document, **kwargs):
                 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