Commit 29393e30 authored by Jérome Perrin's avatar Jérome Perrin

BusinessTemplate: py3 WIP 🚧

parent f398c040
......@@ -7320,7 +7320,7 @@ class TestBusinessTemplate(BusinessTemplateMixin):
skin_folder = skin_tool._getOb(sequence.get('skin_folder_id'))
file_id = 'fake_js_file'
file_content = """
file_content = b"""
var
debug = [42
......
......@@ -723,7 +723,7 @@ class ObjectTemplateItem(BaseTemplateItem):
def __init__(self, id_list, tool_id=None, **kw):
BaseTemplateItem.__init__(self, id_list, tool_id=tool_id, **kw)
if tool_id is not None:
id_list = self._archive.keys()
id_list = ensure_list(self._archive.keys())
self._archive.clear()
for id in id_list :
if id != '':
......@@ -3510,14 +3510,14 @@ class PortalTypeRolesTemplateItem(BaseTemplateItem):
prop_value = role.get(property)
if prop_value:
if isinstance(prop_value, str):
prop_value = escape(prop_value.decode('utf-8'))
prop_value = escape(prop_value)
xml_data += "\n <property id='%s'>%s</property>" % \
(property, prop_value)
# multi
for property in ('categories', 'category', 'base_category'):
for prop_value in role.get(property, []):
if isinstance(prop_value, str):
prop_value = escape(prop_value.decode('utf-8'))
prop_value = escape(prop_value)
xml_data += "\n <multi_property "\
"id='%s'>%s</multi_property>" % (property, prop_value)
xml_data += "\n </role>"
......@@ -3970,7 +3970,7 @@ class FilesystemDocumentTemplateItem(BaseTemplateItem):
if not file_name.endswith('.py'):
LOG('Business Template', 0, 'Skipping file "%s"' % (file_name, ))
return
text = file.read()
text = file.read().decode('utf-8')
self._objects[file_name[:-3]] = text
class FilesystemToZodbTemplateItem(FilesystemDocumentTemplateItem,
......
......@@ -368,7 +368,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "a test file",
data = b"a test file",
content_type = "application/octet-stream",
portal_type = "File",
), '.bin')
......@@ -380,7 +380,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "a test file",
data = b"a test file",
content_type = "application/epub+zip",
portal_type = "File",
), '.epub')
......@@ -392,7 +392,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo.js",
data = "a test file",
data = b"a test file",
portal_type = "File",
), '.js')
......@@ -403,7 +403,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "<script> ... </script>",
data = b"<script> ... </script>",
default_reference = "foo.js",
portal_type = "File",
), '.js')
......@@ -415,7 +415,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "a test file",
data = b"a test file",
content_type = None,
portal_type = "File",
), '.bin')
......@@ -429,7 +429,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "a test file",
data = b"a test file",
content_type = "video/wavelet",
portal_type = "File",
), '.bin')
......@@ -443,7 +443,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo",
data = "a test file",
data = b"a test file",
content_type = "text/x-uri",
portal_type = "File",
), '.txt')
......@@ -472,7 +472,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
where extension (.xml, exported as ._xml to avoid conflict with the meta-data file)
is identified by the title
"""
file_content = """<person>
file_content = b"""<person>
<name>John</name>
<surname>Doe</surname>
</person>
......@@ -524,7 +524,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
"""Test Business Template Import And Export With A PDF Document"""
self._checkTwoFileImportExportForDocumentInDocumentModule(dict(
title = "foo.pdf",
data ="pdf content, maybe should update for base64 sample" ,
data =b"pdf content, maybe should update for base64 sample" ,
portal_type = "PDF",
), '.pdf')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment