More encodign fixes, xml does not know how to encode \x00

diff --git a/src/nepi/util/parser/_xml.py b/src/nepi/util/parser/_xml.py
index 6f3a419..39bb637 100644 (file)
--- a/src/nepi/util/parser/_xml.py
+++ b/src/nepi/util/parser/_xml.py
@@ -9,14 +9,15 @@ import sys
 
 def xmlencode(s):
     if isinstance(s, str):
-        return s.decode("latin1")
+        rv = s.decode("latin1")
     elif not isinstance(s, unicode):
-        return unicode(s)
+        rv = unicode(s)
     else:
-        return s
+        rv = s
+    return rv.replace(u'\x00',u'�')
 
 def xmldecode(s):
-    return s.encode("utf8")
+    return s.replace(u'&#0000',u'\x00').encode("utf8")
 
 class XmlExperimentParser(ExperimentParser):
     def to_xml(self, experiment_description=None, data=None):