diff --git a/barbican_tempest_plugin/services/key_manager/json/consumer_client.py b/barbican_tempest_plugin/services/key_manager/json/consumer_client.py index e0ed5a5..37fbb86 100644 --- a/barbican_tempest_plugin/services/key_manager/json/consumer_client.py +++ b/barbican_tempest_plugin/services/key_manager/json/consumer_client.py @@ -15,7 +15,7 @@ import json -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest import config from tempest.lib.common import rest_client diff --git a/barbican_tempest_plugin/services/key_manager/json/container_client.py b/barbican_tempest_plugin/services/key_manager/json/container_client.py index 7bacf03..7e24396 100644 --- a/barbican_tempest_plugin/services/key_manager/json/container_client.py +++ b/barbican_tempest_plugin/services/key_manager/json/container_client.py @@ -15,7 +15,7 @@ import json -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest import config from tempest.lib.common import rest_client diff --git a/barbican_tempest_plugin/services/key_manager/json/order_client.py b/barbican_tempest_plugin/services/key_manager/json/order_client.py index 85455b7..d7a3945 100644 --- a/barbican_tempest_plugin/services/key_manager/json/order_client.py +++ b/barbican_tempest_plugin/services/key_manager/json/order_client.py @@ -15,7 +15,7 @@ import json -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest import config from tempest.lib.common import rest_client diff --git a/barbican_tempest_plugin/services/key_manager/json/quota_client.py b/barbican_tempest_plugin/services/key_manager/json/quota_client.py index f874648..ba09b56 100644 --- a/barbican_tempest_plugin/services/key_manager/json/quota_client.py +++ b/barbican_tempest_plugin/services/key_manager/json/quota_client.py @@ -15,7 +15,7 @@ import json -from six.moves.urllib import parse as urllib +from urllib import parse as urllib from tempest import config from tempest.lib.common import rest_client diff --git a/barbican_tempest_plugin/services/key_manager/json/secret_client.py b/barbican_tempest_plugin/services/key_manager/json/secret_client.py index 4958c25..8c1fa16 100644 --- a/barbican_tempest_plugin/services/key_manager/json/secret_client.py +++ b/barbican_tempest_plugin/services/key_manager/json/secret_client.py @@ -15,7 +15,6 @@ import json -import six from tempest import config from tempest.lib.common import rest_client @@ -29,7 +28,7 @@ class SecretClient(rest_client.RestClient): if 'name' not in kwargs: kwargs['name'] = data_utils.rand_name("tempest-sec") - if 'payload' in kwargs and type(kwargs['payload']) is six.binary_type: + if 'payload' in kwargs and type(kwargs['payload']) is bytes: kwargs['payload'] = kwargs['payload'].decode('utf-8') post_body = kwargs diff --git a/requirements.txt b/requirements.txt index 761711f..67ae150 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 -six>=1.10.0 # MIT tempest>=17.1.0 # Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0