From 81191a58ee13c221d3d7b4375e809728cc978192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Sun, 21 Apr 2024 07:46:03 +0200
Subject: [PATCH] dqe: fix python3 compatibility
---
.../document.erp5.DQEDataValidatorClientConnector.py | 8 ++++----
.../erp5_dqe/HTTPExchange_getSentToDQEValueCaption.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bt5/erp5_dqe/DocumentTemplateItem/portal_components/document.erp5.DQEDataValidatorClientConnector.py b/bt5/erp5_dqe/DocumentTemplateItem/portal_components/document.erp5.DQEDataValidatorClientConnector.py
index a376b0c12d..0074020a27 100644
--- a/bt5/erp5_dqe/DocumentTemplateItem/portal_components/document.erp5.DQEDataValidatorClientConnector.py
+++ b/bt5/erp5_dqe/DocumentTemplateItem/portal_components/document.erp5.DQEDataValidatorClientConnector.py
@@ -1,9 +1,9 @@
import requests
from json import loads
from socket import timeout
-from requests import ConnectionError, Timeout
+from requests import ConnectionError as _ConnectionError, Timeout
from Products.ERP5Type.XMLObject import XMLObject
-from urllib import urlencode
+from six.moves import urllib
from zLOG import LOG, INFO
class DQEDataValidatorClientConnector(XMLObject):
@@ -23,7 +23,7 @@ class DQEDataValidatorClientConnector(XMLObject):
try:
base_url = self.getServerUrl() + method_name + '/'
response = requests.get(base_url, params=params, timeout=self.getTimeout())
- except (Timeout, timeout, ConnectionError):
+ except (Timeout, timeout, _ConnectionError):
raw_response = 'TIMEOUT'
result_dict = {}
else:
@@ -41,7 +41,7 @@ class DQEDataValidatorClientConnector(XMLObject):
archiveExchange = self._getTypeBasedMethod('archiveExchange')
if archiveExchange is not None:
archiveExchange(
- raw_request=base_url + '?' + urlencode(params), # XXX is this correct?
+ raw_request=base_url + '?' + urllib.urlparse.urlencode(params), # XXX is this correct?
raw_response=raw_response,
service=service,
archive_kw=archive_kw,
diff --git a/bt5/erp5_dqe/SkinTemplateItem/portal_skins/erp5_dqe/HTTPExchange_getSentToDQEValueCaption.py b/bt5/erp5_dqe/SkinTemplateItem/portal_skins/erp5_dqe/HTTPExchange_getSentToDQEValueCaption.py
index 1445df5b19..713c38b47e 100644
--- a/bt5/erp5_dqe/SkinTemplateItem/portal_skins/erp5_dqe/HTTPExchange_getSentToDQEValueCaption.py
+++ b/bt5/erp5_dqe/SkinTemplateItem/portal_skins/erp5_dqe/HTTPExchange_getSentToDQEValueCaption.py
@@ -1,4 +1,4 @@
-import urlparse
+from six.moves import urllib
resource_value = context.getResourceValue()
if not resource_value.isMemberOf('http_exchange_resource/dqe'):
@@ -7,7 +7,7 @@ if not resource_value.isMemberOf('http_exchange_resource/dqe'):
request = context.getRequest()
if not request:
return ''
-query_dict = urlparse.parse_qs(urlparse.urlparse(request).query)
+query_dict = urllib.urlparse.parse_qs(urllib.urlparse.urlparse(request).query)
dqe_resource_category = context.getPortalObject().portal_categories.http_exchange_resource.dqe
service_value_to_key_list_dict = {
dqe_resource_category.DefaultEmail: ('Email', ),
--
2.30.9