From 0dc9e9105eac1027b5151509c7cc13e090f378dc Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Thu, 25 Jul 2019 09:41:18 +0800 Subject: [PATCH] VNX/Powermax: Make it work under python3 Add and remove the unnecessary `encode`. Change-Id: I2fbbd9d3950d4b68eca9905839a1f910e5a8ce4a Closes-bug: #1853805 (cherry picked from commit ddfb07987b15e53747d457dfc2e77fee5171fb40) (cherry picked from commit ce302d04ecb4ef69ed14f2a8e982e8170f3e60a0) --- manila/share/drivers/dell_emc/common/enas/connector.py | 4 ++-- manila/share/drivers/dell_emc/common/enas/xml_api_parser.py | 2 +- manila/tests/share/drivers/dell_emc/common/enas/fakes.py | 2 +- .../share/drivers/dell_emc/common/enas/test_connector.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manila/share/drivers/dell_emc/common/enas/connector.py b/manila/share/drivers/dell_emc/common/enas/connector.py index 70ed2e21c1..cf72d73a77 100644 --- a/manila/share/drivers/dell_emc/common/enas/connector.py +++ b/manila/share/drivers/dell_emc/common/enas/connector.py @@ -58,7 +58,7 @@ class XMLAPIConnector(object): credential = ('user=' + self.username + '&password=' + self.password + '&Login=Login') - req = url_request.Request(self.auth_url, credential, + req = url_request.Request(self.auth_url, credential.encode(), constants.CONTENT_TYPE_URLENCODE) resp = self.url_opener.open(req) resp_body = resp.read() @@ -98,7 +98,7 @@ class XMLAPIConnector(object): def _request(self, req_body=None, method=None, header=constants.CONTENT_TYPE_URLENCODE): - req = url_request.Request(self._url, req_body, header) + req = url_request.Request(self._url, req_body.encode(), header) if method not in (None, 'GET', 'POST'): req.get_method = lambda: method self._http_log_req(req) diff --git a/manila/share/drivers/dell_emc/common/enas/xml_api_parser.py b/manila/share/drivers/dell_emc/common/enas/xml_api_parser.py index 7b3c3e61ea..b9fecac369 100644 --- a/manila/share/drivers/dell_emc/common/enas/xml_api_parser.py +++ b/manila/share/drivers/dell_emc/common/enas/xml_api_parser.py @@ -56,7 +56,7 @@ class XMLAPIParser(object): events = ("start", "end") - context = etree.iterparse(six.BytesIO(xml.encode('utf-8')), + context = etree.iterparse(six.BytesIO(xml), events=events) for action, elem in context: self.tag = self._remove_ns(elem.tag) diff --git a/manila/tests/share/drivers/dell_emc/common/enas/fakes.py b/manila/tests/share/drivers/dell_emc/common/enas/fakes.py index a5ec9d5b5c..18b8d9978b 100644 --- a/manila/tests/share/drivers/dell_emc/common/enas/fakes.py +++ b/manila/tests/share/drivers/dell_emc/common/enas/fakes.py @@ -55,7 +55,7 @@ def response(func): 'xml_api">' + func(*args, **kwargs) + '' - ) + ).encode() return inner diff --git a/manila/tests/share/drivers/dell_emc/common/enas/test_connector.py b/manila/tests/share/drivers/dell_emc/common/enas/test_connector.py index 233d47c2bc..b6c1065bba 100644 --- a/manila/tests/share/drivers/dell_emc/common/enas/test_connector.py +++ b/manila/tests/share/drivers/dell_emc/common/enas/test_connector.py @@ -46,7 +46,7 @@ class XMLAPIConnectorTestData(object): 'user=' + fakes.FakeData.emc_nas_login + '&password=' + fakes.FakeData.emc_nas_password + '&Login=Login' - ) + ).encode() @staticmethod def req_url_encode():