From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Thu, 4 Aug 2011 12:29:56 +0000 (+0200)
Subject: More encodign fixes, xml does not know how to encode \x00
X-Git-Tag: nepi-3.0.0~319
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7f3d687397f670f3a774b13c5a3c5c2d01a1723c;p=nepi.git

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 6f3a4197..39bb637d 100644
--- 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'&#0000;')
 
 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):