From b9eae3b28b96d704eb59a7e2e62d2b373014ebf1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 19 Feb 2024 00:56:16 +0900 Subject: [PATCH] Remove six This library no longer supports python 2 thus usage of six is no longer needed. Change-Id: Ie61802ea3b3a995666a8d66e08c9afd129e15f04 --- dracclient/tests/test_wsman.py | 6 +++--- dracclient/wsman.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dracclient/tests/test_wsman.py b/dracclient/tests/test_wsman.py index c0d6ea5..bdc5a42 100644 --- a/dracclient/tests/test_wsman.py +++ b/dracclient/tests/test_wsman.py @@ -19,7 +19,6 @@ import lxml.etree import lxml.objectify import requests.exceptions import requests_mock -import six from dracclient import exceptions from dracclient.tests import base @@ -58,8 +57,9 @@ class ClientTestCase(base.BaseTest): @requests_mock.Mocker() def test_enumerate_with_invalid_utf8(self, mock_requests): - mock_requests.post('https://1.2.3.4:443/wsman', - content=six.b('yay!\xC0')) + mock_requests.post( + 'https://1.2.3.4:443/wsman', + content='yay!\xC0'.encode('latin-1')) resp = self.client.enumerate('resource') self.assertEqual('yay!', resp.text) diff --git a/dracclient/wsman.py b/dracclient/wsman.py index 55cf548..ca2220f 100644 --- a/dracclient/wsman.py +++ b/dracclient/wsman.py @@ -13,7 +13,6 @@ import logging import re -import six import time import uuid @@ -167,9 +166,10 @@ class Client(object): # Filter out everything except for printable ASCII characters and # tab - resp_xml = ElementTree.fromstring(re.sub(six.b('[^\x20-\x7e\t]'), - six.b(''), - resp.content)) + resp_xml = ElementTree.fromstring(re.sub( + '[^\x20-\x7e\t]'.encode('latin-1'), + ''.encode('latin-1'), + resp.content)) if auto_pull: # The first response returns ""