Remove six
Remove six Replace the following items with Python 3 style code. - six.moves.urllib - six.binary_type Change-Id: I234c3b205ee21b59953aa6ce7af5c2a1e4a6cfa6
This commit is contained in:
parent
f61b0d1300
commit
0525790271
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from six.moves.urllib import parse as urllib
|
from urllib import parse as urllib
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from six.moves.urllib import parse as urllib
|
from urllib import parse as urllib
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from six.moves.urllib import parse as urllib
|
from urllib import parse as urllib
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from six.moves.urllib import parse as urllib
|
from urllib import parse as urllib
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
|
|
||||||
import json
|
import json
|
||||||
import six
|
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
from tempest.lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
@ -29,7 +28,7 @@ class SecretClient(rest_client.RestClient):
|
||||||
if 'name' not in kwargs:
|
if 'name' not in kwargs:
|
||||||
kwargs['name'] = data_utils.rand_name("tempest-sec")
|
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')
|
kwargs['payload'] = kwargs['payload'].decode('utf-8')
|
||||||
|
|
||||||
post_body = kwargs
|
post_body = kwargs
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
|
|
||||||
six>=1.10.0 # MIT
|
|
||||||
tempest>=17.1.0 # Apache-2.0
|
tempest>=17.1.0 # Apache-2.0
|
||||||
cryptography>=2.1 # BSD/Apache-2.0
|
cryptography>=2.1 # BSD/Apache-2.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue