From 10787b897914beb70d3db0bdef5ba3d827756a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Mon, 12 Aug 2024 16:40:10 +0200
Subject: [PATCH] py3: cloudooo.git/d4abf3ff: convertFile() take an str() and
returns an str().
---
.../portal_components/module.erp5.TransformLib.py | 7 ++++---
.../extension.erp5.TemplateDocumentConversion.py | 3 ++-
product/ERP5OOo/transforms/oood_commandtransform.py | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/bt5/erp5_base/ModuleComponentTemplateItem/portal_components/module.erp5.TransformLib.py b/bt5/erp5_base/ModuleComponentTemplateItem/portal_components/module.erp5.TransformLib.py
index b22412af84a..bed5811426e 100644
--- a/bt5/erp5_base/ModuleComponentTemplateItem/portal_components/module.erp5.TransformLib.py
+++ b/bt5/erp5_base/ModuleComponentTemplateItem/portal_components/module.erp5.TransformLib.py
@@ -3,6 +3,7 @@
from Products.PortalTransforms.interfaces import ITransform
from zope.interface import implementer
from erp5.component.document.Document import DocumentConversionServerProxy, ConversionError, enc, dec
+from Products.ERP5Type.Utils import bytes2str, str2bytes
@implementer(ITransform)
class DocumentConversionServerTransform:
"""
@@ -51,13 +52,13 @@ class DocumentConversionServerTransform:
source_format = self._getFormatFromMimetype(source_mimetype)
destination_format = self._getFormatFromMimetype(self.output)
- data.setData(dec(server_proxy.convertFile(
- enc(orig),
+ data.setData(dec(str2bytes(server_proxy.convertFile(
+ byte2str(enc(orig)),
source_format,
destination_format,
# Default values are ConversionServer default ones
kwargs.get('zip', False),
kwargs.get('refresh', False),
- kwargs.get('conversion_kw', {}))))
+ kwargs.get('conversion_kw', {})))))
return data
\ No newline at end of file
diff --git a/bt5/erp5_corporate_identity/ExtensionTemplateItem/portal_components/extension.erp5.TemplateDocumentConversion.py b/bt5/erp5_corporate_identity/ExtensionTemplateItem/portal_components/extension.erp5.TemplateDocumentConversion.py
index 59e23c7e88b..9cb950502d2 100644
--- a/bt5/erp5_corporate_identity/ExtensionTemplateItem/portal_components/extension.erp5.TemplateDocumentConversion.py
+++ b/bt5/erp5_corporate_identity/ExtensionTemplateItem/portal_components/extension.erp5.TemplateDocumentConversion.py
@@ -31,6 +31,7 @@
from erp5.component.document.Document import DocumentConversionServerProxy
from base64 import b64encode, b64decode
from zExceptions import Unauthorized
+from Products.ERP5Type.Utils import bytes2str
def convertDocumentByConversionServer(
self,
@@ -48,7 +49,7 @@ def convertDocumentByConversionServer(
proxy = DocumentConversionServerProxy(self)
return b64decode(
proxy.convertFile(
- b64encode(data),
+ bytes2str(b64encode(data)),
source_mimetype,
destination_mimetype,
zip,
diff --git a/product/ERP5OOo/transforms/oood_commandtransform.py b/product/ERP5OOo/transforms/oood_commandtransform.py
index 63e88cb64c9..04742361dba 100644
--- a/product/ERP5OOo/transforms/oood_commandtransform.py
+++ b/product/ERP5OOo/transforms/oood_commandtransform.py
@@ -228,11 +228,11 @@ class OOOdCommandTransform(commandtransform):
response_code, response_dict, message = server_proxy.run_generate(
'',
- enc(self.data),
+ enc(self.data).decode(),
None,
format,
self.mimetype)
- data = dec(response_dict['data'])
+ data = dec(response_dict['data'].encode())
if self.mimetype == 'text/html':
data = self.includeImageList(data)
return data
--
2.30.9