Remove six
This library no longer supports python 2 thus usage of six is no longer needed. Change-Id: Ie61802ea3b3a995666a8d66e08c9afd129e15f04
This commit is contained in:
parent
b4f1db2231
commit
b9eae3b28b
@ -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('<result>yay!\xC0</result>'))
|
||||
mock_requests.post(
|
||||
'https://1.2.3.4:443/wsman',
|
||||
content='<result>yay!\xC0</result>'.encode('latin-1'))
|
||||
|
||||
resp = self.client.enumerate('resource')
|
||||
self.assertEqual('yay!', resp.text)
|
||||
|
@ -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 "<wsman:Items>"
|
||||
|
Loading…
Reference in New Issue
Block a user