Merge "Remove six"

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

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

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

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

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

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