[Erp5-report] r46059 jm - /erp5/trunk/utils/xml_marshaller/src/xml_marshaller/

[nobody at svn.erp5.org]

Author: jm
Date: Wed Sep 12 15:28:18 2018
New Revision: 46059

URL: http://svn.erp5.org?rev=46059&view=rev
Log:
fixup! xml_marshaller: add support for Python 3

Modified:
    erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py

Modified: erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py
URL: http://svn.erp5.org/erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py?rev=46059&r1=46058&r2=46059&view=diff
==============================================================================
--- erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py [utf8] (original)
+++ erp5/trunk/utils/xml_marshaller/src/xml_marshaller/xml_marshaller.py [utf8] Wed Sep 12 15:28:18 2018
@@ -596,11 +596,13 @@ class Unmarshaller(ElementTreeContentHan
       try:
         value = klass(*initargs)
       except TypeError as err:
-        reraise(TypeError, 'in constructor for %s: %s' % (
-            klass.__name__, err), sys.exc_info()[2])
+        reraise(TypeError, TypeError('in constructor for %s: %s' % (
+            klass.__name__, err)), sys.exc_info()[2])
 
     # Now set the object's attributes from the marshalled dictionary
     for k, v in kw.items():
+      if not isinstance(k, str):
+        k = k.decode()
       setattr(value, k, v)
     self.data_stack[-5:] = [value]