From 2111a89dea28b2650fb988c2cb9646a9243baa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ramos=20Carre=C3=B1o?= <carlos.ramos@nexedi.com> Date: Tue, 16 Apr 2024 16:46:52 +0900 Subject: [PATCH] Fix tests for erp5_officejs in Python 2. --- ...icWebSite_getRedirectSourceUrlForOfficeJSApplication.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py index 89df0fc6986..2733de8a266 100644 --- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py +++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py @@ -8,6 +8,8 @@ Redirect to domain specified as layout property on website import binascii import base64 +from Products.ERP5Type.Utils import bytes2str, str2bytes +import six result_dict = {"error":"url missing definition view path"} base_64 = False @@ -19,8 +21,9 @@ except KeyError: return result_dict try: - encoded = name.replace("definition_view/", "", 1).encode() - name = base64.decodebytes(encoded).decode() + encoded = str2bytes(name.replace("definition_view/", "", 1)) + decode_method = base64.decodebytes if six.PY3 else base64.decodestring + name = bytes2str(decode_method(encoded)) base_64 = True except binascii.Error: pass -- 2.30.9