fixup! fixup! fixup! fixup! fixup! XMLExportImport: more support pickle...

fixup! fixup! fixup! fixup! fixup! XMLExportImport: more support pickle protocol 3 🚧 ( repair python2 )

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testXMLPickle.py

@@ -52,8 +52,7 @@ class XMLPickleTestCase(unittest.TestCase):
     pickled_string = pickle.dumps(obj, protocol=self._pickle_protocol)
     f = BytesIO(pickled_string)
     xml = ppml.ToXMLUnpickler(f).load().__str__()
-    if six.PY2 and isinstance(xml, six.text_type):
-      xml = xml.encode('utf-8')
+    self.assertIsInstance(xml, str)
     return xml
 
   def load_from_xml(self, xml_string, persistent_load=None):

product/ERP5Type/XMLExportImport/ppml.py

@@ -32,7 +32,7 @@ import re
 from marshal import loads as mloads
 from .xyap import NoBlanks
 from .xyap import xyap
-from Products.ERP5Type.Utils import str2bytes, bytes2str
+from Products.ERP5Type.Utils import bytes2str, str2bytes, unicode2str
 
 from marshal import dumps as mdumps
 
@@ -210,6 +210,9 @@ class Unicode(String):
             return 'string'
         return super(Unicode, self).tag_name()
 
+    def value(self):
+        return unicode2str(super(Unicode, self).value())
+
 
 class Bytes(String):
     pass