Merge remote-tracking branch 'origin/master' into zope4py2

a1580754 · Arnaud Fontaine · 19cb80e6 · 968991e7 · a1580754
Commit a1580754 authored Feb 28, 2022 by Arnaud Fontaine
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

product/ERP5/tests/testBusinessTemplateTwoFileExport.py product/ERP5/tests/testBusinessTemplateTwoFileExport.py +3 -1

No files found.
--- a/product/ERP5/tests/testBusinessTemplateTwoFileExport.py
+++ b/product/ERP5/tests/testBusinessTemplateTwoFileExport.py
@@ -1081,7 +1081,9 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
                         "content_type": "text/html",
                         "output_encoding": "iso-8859-15"}
    skin_folder._setObject(page_template_id, ZopePageTemplate(
-      page_template_id, page_template_text, page_template_kw["content_type"]))
+      page_template_id, page_template_text, page_template_kw["content_type"],
+      # When not passed, default to iso-8859-15 on Zope2 and utf-8 on Zope4
+      output_encoding=page_template_kw["output_encoding"]))

    self.template.edit(template_skin_id_list=[skin_folder_id+'/'+page_template_id,])