str to bytes for testDms WIP

29506720 · Emmy Vouriot · Jérome Perrin · 156c24f9 · 29506720
Commit 29506720 authored Aug 08, 2023 by Emmy Vouriot Committed by Jérome Perrin May 28, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.TextDocument.py ...plateItem/portal_components/document.erp5.TextDocument.py +3 -1

No files found.
--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.TextDocument.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.TextDocument.py
@@ -333,7 +333,9 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
        charset = re_match.group('charset')
        try:
          # Use encoding in html document
-          text_content = text_content.decode(charset).encode('utf-8')
+          text_content = text_content.decode(charset)
+          if six.PY2:
+            text_content = text_content.encode('utf-8')
        except (UnicodeDecodeError, LookupError):
          # Encoding read from document is wrong
          text_content, message = guessCharsetAndConvert(self,