BusinessTemplate: py3

product/ERP5/Document/BusinessTemplate.py

@@ -352,7 +352,6 @@ class BusinessTemplateArchive(object):
       if hasattr(obj, 'read'):
         obj.seek(0)
         obj = obj.read()
-        #import pdb; pdb.set_trace()
       if not isinstance(obj, bytes):
         obj = obj.encode('utf-8')
       self.revision.hash(path, obj)
@@ -876,7 +875,7 @@ class ObjectTemplateItem(BaseTemplateItem):
 
         f = StringIO()
         exportXML(obj._p_jar, obj._p_oid, f)
-        bta.addObject(f.getvalue().encode(), key, path=path)
+        bta.addObject(str2bytes(f.getvalue()), key, path=path)
 
       if catalog_method_template_item:
         # add all datas specific to catalog inside one file
@@ -1533,7 +1532,7 @@ class ObjectTemplateItem(BaseTemplateItem):
             # in a separate file (such as the one from
             # testTemplateTool.TestTemplateTool.test_updateBusinessTemplateFromUrl_keep_list)
             # data might be loaded as a string, fix this here.
-            if not isinstance(obj.data, (bytes, Pdata)):
+            if obj.data is not None and not isinstance(obj.data, (bytes, Pdata)):
               obj.data = obj.data.encode()
             # XXX Calling obj._setData() would call Interaction Workflow such
             # as document_conversion_interaction_workflow which would update
@@ -6115,8 +6114,8 @@ Business Template is a set of definitions, such as skins, portal types and categ
                      '_test_item', '_message_translation_item',]
 
       if item_name in item_list_1:
-        f1 = BytesIO() # for XML export of New Object
-        f2 = BytesIO() # For XML export of Installed Object
+        f1 = StringIO() # for XML export of New Object
+        f2 = StringIO() # For XML export of Installed Object
         # Remove unneeded properties
         new_object = new_item.removeProperties(new_object, 1)
         installed_object = installed_item.removeProperties(installed_object, 1)
@@ -6760,7 +6759,9 @@ Business Template is a set of definitions, such as skins, portal types and categ
 
       from base64 import b64encode
       def __newTempComponent(portal_type, reference, source_reference, migrate=False):
-        uid = b64encode("%s|%s|%s" % (portal_type, reference, source_reference))
+        uid = b64encode(("%s|%s|%s" % (portal_type, reference, source_reference)).encode())
+        if six.PY3:
+          uid = uid.decode()
         if migrate:
           bt_migratable_uid_list.append(uid)