diff --git a/requirements.txt b/requirements.txt index 0ea703d..88c4707 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ # process, which may cause wedges in the gate later. pbr!=2.1.0,>=2.0.0 # Apache-2.0 -six>=1.10.0 # MIT oslo.utils>=3.33.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 diff --git a/zun_tempest_plugin/tests/tempest/api/clients.py b/zun_tempest_plugin/tests/tempest/api/clients.py index 8bffb92..7d0c767 100644 --- a/zun_tempest_plugin/tests/tempest/api/clients.py +++ b/zun_tempest_plugin/tests/tempest/api/clients.py @@ -12,7 +12,6 @@ import contextlib import docker -from six.moves.urllib import parse from tempest.common import credentials_factory as common_creds from tempest import config from tempest.lib.common import api_version_utils @@ -25,6 +24,7 @@ from tempest.lib.services.network import subnetpools_client from tempest.lib.services.network import subnets_client from tempest.lib.services.volume.v3 import volumes_client from tempest import manager +from urllib import parse from zun_tempest_plugin.tests.tempest.api.models import capsule_model from zun_tempest_plugin.tests.tempest.api.models import container_model diff --git a/zun_tempest_plugin/tests/tempest/api/test_containers.py b/zun_tempest_plugin/tests/tempest/api/test_containers.py index 98f7389..2b4452f 100644 --- a/zun_tempest_plugin/tests/tempest/api/test_containers.py +++ b/zun_tempest_plugin/tests/tempest/api/test_containers.py @@ -19,7 +19,6 @@ import types from oslo_serialization import jsonutils as json from oslo_utils import encodeutils -import six from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators @@ -140,8 +139,8 @@ class TestContainer(base.BaseZunTest): # returns generator [1]. These lines # makes image_data readable. # [1] https://bugs.launchpad.net/zun/+bug/1753080 - image_data = six.b('').join(image_data) - image_data = six.BytesIO(image_data) + image_data = ''.encode("latin-1").join(image_data) + image_data = BytesIO(image_data) image = self.images_client.create_image( name='cirros', disk_format='raw', container_format='docker') @@ -255,7 +254,7 @@ class TestContainer(base.BaseZunTest): network_id = list(container.addresses.keys())[0] self.assertIn(network_id, container.addresses) for addr in container.addresses[network_id]: - if six.viewitems(address) <= six.viewitems(addr): + if address.items() <= addr.items(): break else: self.fail('Address %s is not found in container %s.' % diff --git a/zun_tempest_plugin/tests/tempest/utils.py b/zun_tempest_plugin/tests/tempest/utils.py index fb5704e..6aaa0e4 100644 --- a/zun_tempest_plugin/tests/tempest/utils.py +++ b/zun_tempest_plugin/tests/tempest/utils.py @@ -14,7 +14,6 @@ import base64 import functools import time -import six from tempest import config from tempest.lib.common import api_version_utils @@ -57,7 +56,7 @@ def requires_microversion(min_version, max_version='latest', **kwargs): def encode_file_data(data): - if six.PY3 and isinstance(data, str): + if isinstance(data, str): data = data.encode('utf-8') return base64.b64encode(data).decode('utf-8')