str to bytes WIP

e570e405 · Emmy Vouriot · Jérome Perrin · 056ff11e · e570e405 · e570e405
Commit e570e405 authored Jul 29, 2023 by Emmy Vouriot Committed by Jérome Perrin May 19, 2024
3 changed files
--- a/bt5/erp5_dms/DocumentTemplateItem/portal_components/document.erp5.PDFDocument.py
+++ b/bt5/erp5_dms/DocumentTemplateItem/portal_components/document.erp5.PDFDocument.py
@@ -32,7 +32,7 @@ import zope.interface
 from AccessControl import ClassSecurityInfo

 from Products.ERP5Type import Permissions, PropertySheet
-from Products.ERP5Type.Utils import bytes2str
+from Products.ERP5Type.Utils import bytes2str, str2bytes
 from erp5.component.interface.IWatermarkable import IWatermarkable
 from erp5.component.document.Image import Image
 from erp5.component.document.Document import ConversionError
@@ -291,10 +291,10 @@ class PDFDocument(Image):
    finally:
      tmp.close()
    # Quick hack to remove bg color - XXX
-    h = command_result.replace('<BODY bgcolor="#A0A0A0"', '<BODY ')
+    h = command_result.replace(b'<BODY bgcolor="#A0A0A0"', b'<BODY ')
    # Make links relative
-    h = h.replace('href="%s.html' % tmp.name.split(os.sep)[-1],
-                                                          'href="asEntireHTML')
+    h = h.replace(str2bytes('href="%s.html' % tmp.name.split(os.sep)[-1]),
+                                                          b'href="asEntireHTML')
    return h

  security.declarePrivate('_convertToDJVU')

--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.EmailDocument.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.EmailDocument.py
@@ -28,6 +28,7 @@
 ##############################################################################

 import re
+import six
 from DateTime import DateTime
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
@@ -47,7 +48,10 @@ except ImportError:
    not installed yet.
    """

-from email import message_from_string
+if six.PY2:
+  from email import message_from_string as message_from_x
+else:
+  from email import message_from_bytes as message_from_x
 from email.utils import parsedate_tz, mktime_tz

 DEFAULT_TEXT_FORMAT = 'text/html'
@@ -170,7 +174,7 @@ class EmailDocument(TextDocument, MailMessageMixin):
          content_type=self.getContentType(),
          embedded_file_list=self.getAggregateValueList(portal_type=document_type_list),
        )
-      result = message_from_string(data)
+      result = message_from_x(data)
      self._v_message = result
    return result


--- a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.MailMessageMixin.py
+++ b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.MailMessageMixin.py
@@ -35,6 +35,7 @@ from zLOG import LOG, INFO
 from email.header import decode_header, HeaderParseError

 import re
+import six

 filename_regexp = 'name="([^"]*)"'

@@ -43,7 +44,8 @@ def testCharsetAndConvert(text_content, content_type, encoding):
    if encoding is not None:
      text_content = text_content.decode(encoding).encode('utf-8')
    else:
-      text_content = text_content.decode().encode('utf-8')
+      if six.PY2:
+        text_content = text_content.decode().encode('utf-8')
  except (UnicodeDecodeError, LookupError):
    encoding = guessEncodingFromText(text_content, content_type)
    if encoding is not None: