Merge "Remove all usage of six library"
This commit is contained in:
commit
c611b45680
|
@ -18,7 +18,6 @@ import pkg_resources
|
||||||
import random
|
import random
|
||||||
import requests
|
import requests
|
||||||
import shlex
|
import shlex
|
||||||
import six
|
|
||||||
import socket
|
import socket
|
||||||
import string
|
import string
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -1141,4 +1140,4 @@ class LoadBalancerBaseTestWithCompute(LoadBalancerBaseTest):
|
||||||
self.assertEqual(response_content,
|
self.assertEqual(response_content,
|
||||||
session.get_redirect_target(req))
|
session.get_redirect_target(req))
|
||||||
elif response_content:
|
elif response_content:
|
||||||
self.assertEqual(six.text_type(response_content), req.text)
|
self.assertEqual(str(response_content), req.text)
|
||||||
|
|
|
@ -13,7 +13,6 @@ oslotest>=3.2.0 # Apache-2.0
|
||||||
python-barbicanclient>=4.5.2 # Apache-2.0
|
python-barbicanclient>=4.5.2 # Apache-2.0
|
||||||
pyOpenSSL>=17.1.0 # Apache-2.0
|
pyOpenSSL>=17.1.0 # Apache-2.0
|
||||||
requests>=2.14.2 # Apache-2.0
|
requests>=2.14.2 # Apache-2.0
|
||||||
six>=1.10.0 # MIT
|
|
||||||
tempest>=17.1.0 # Apache-2.0
|
tempest>=17.1.0 # Apache-2.0
|
||||||
tenacity>=4.4.0 # Apache-2.0
|
tenacity>=4.4.0 # Apache-2.0
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
|
|
Loading…
Reference in New Issue