[tools] Use odml tuple export

Closes #353, closes #250

Use the parser_utils odml_tuple_export function
in xmlparser and dict_parser. It is required to
properly serialize odml style tuples to XML, JSON
and YAML files.

Author: mpsonntag

odml/tools/dict_parser.py

@@ -5,7 +5,7 @@
 
 from .. import format as odmlfmt
 from ..info import FORMAT_VERSION
-from .parser_utils import InvalidVersionException, ParserException
+from .parser_utils import InvalidVersionException, ParserException, odml_tuple_export
 
 
 class DictWriter:
@@ -107,8 +107,8 @@ def get_properties(props_list):
                     elif (tag == []) or tag:  # Even if 'values' is empty, allow '[]'
                         # Custom odML tuples require special handling.
                         if attr == "values" and prop.dtype and \
-                                prop.dtype.endswith("-tuple") and len(prop.values) > 0:
-                            prop_dict["value"] = "(%s)" % ";".join(prop.values[0])
+                                prop.dtype.endswith("-tuple") and prop.values:
+                            prop_dict["value"] = odml_tuple_export(prop.values)
                         else:
                             # Always use the arguments key attribute name when saving
                             prop_dict[i] = tag

odml/tools/xmlparser.py

@@ -22,7 +22,7 @@
 
 from .. import format as ofmt
 from ..info import FORMAT_VERSION
-from .parser_utils import InvalidVersionException, ParserException
+from .parser_utils import InvalidVersionException, ParserException, odml_tuple_export
 
 try:
     unicode = unicode
@@ -121,8 +121,8 @@ def save_element(curr_el):
                 continue
             if isinstance(fmt, ofmt.Property.__class__) and k == "value":
                 # Custom odML tuples require special handling for save loading from file.
-                if curr_el.dtype and curr_el.dtype.endswith("-tuple") and len(val) > 0:
-                    ele = E(k, "(%s)" % ";".join(val[0]))
+                if curr_el.dtype and curr_el.dtype.endswith("-tuple") and val:
+                    ele = E(k, odml_tuple_export(val))
                 else:
                     ele = E(k, to_csv(val))
                 cur.append(ele)