From d3ee37b24123ec4cc43d963c868dcc7178eeedea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Sat, 10 Feb 2024 19:14:19 +0900
Subject: [PATCH] bytes data

---
 .../erp5_dms_conversion_catalog/Base_isConvertible.py           | 2 +-
 .../portal_components/document.erp5.Sound.py                    | 2 +-
 .../portal_components/mixin.erp5.CachedConvertableMixin.py      | 2 +-
 product/PortalTransforms/transforms/png_to_text.py              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/Base_isConvertible.py b/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/Base_isConvertible.py
index 9125c3da2d7..5dc6b0eaac5 100644
--- a/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/Base_isConvertible.py
+++ b/bt5/erp5_dms_conversion_catalog/SkinTemplateItem/portal_skins/erp5_dms_conversion_catalog/Base_isConvertible.py
@@ -1,7 +1,7 @@
 """
   Return true or false based on if document is convertible or not.
 """
-MARKER = (None, '',)
+MARKER = (None, b'',)
 portal = context.getPortalObject()
 
 portal_type = context.getPortalType()
diff --git a/bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py b/bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py
index 418dd0043a9..3925a6c65e3 100644
--- a/bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py
+++ b/bt5/erp5_multimedia/DocumentTemplateItem/portal_components/document.erp5.Sound.py
@@ -86,4 +86,4 @@ class Sound(File):
       RESPONSE.setHeader('Content-Range',
                          'bytes %s-%s/%s' % (start, end-1, total_length))
       RESPONSE.setStatus(206)
-    return str(data)
\ No newline at end of file
+    return bytes(data)
\ No newline at end of file
diff --git a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
index cf98c9ef6d2..e8744b7d3d2 100644
--- a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
+++ b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
@@ -228,7 +228,7 @@ class CachedConvertableMixin:
     if isinstance(data, OFSImage):
       data = data.data
     if isinstance(data, Pdata):
-      data = str(data)
+      data = bytes(data)
     return mime, data
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getConversionSize')
diff --git a/product/PortalTransforms/transforms/png_to_text.py b/product/PortalTransforms/transforms/png_to_text.py
index 134811c4741..a3f1107491b 100644
--- a/product/PortalTransforms/transforms/png_to_text.py
+++ b/product/PortalTransforms/transforms/png_to_text.py
@@ -39,7 +39,7 @@ class png_to_text(popentransform):
         else:
             popen = Popen([command, tmpname], env=environment, stdin=PIPE,
                                                                    stdout=PIPE)
-            out = popen.communicate(str(data))[0]
+            out = popen.communicate(bytes(data))[0]
 
         if not self.useStdin:
             # remove tmp file
-- 
2.30.9