commit c611b456803f6e556970a8b9df1d1093e38a6ff1
author Zuul <zuul@review.opendev.org> Wed Aug 26 08:46:05 2020 +0000
committer Gerrit Code Review <review@openstack.org> Wed Aug 26 08:46:05 2020 +0000
tree 41170a7731e27b26d8a5de34e76b8a226b4dcdf3
parent 12c7799296e9bbd764f25b09b23c67eb14cb1700
parent bd587263755716f3de4987ae177e97fc28e957c0

Merge "Remove all usage of six library"

octavia_tempest_plugin/tests/test_base.py

diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py
index bd1a225..d2c4014 100644
--- a/octavia_tempest_plugin/tests/test_base.py
+++ b/octavia_tempest_plugin/tests/test_base.py
@@ -18,7 +18,6 @@
 import random
 import requests
 import shlex
-import six
 import socket
 import string
 import subprocess
@@ -1141,4 +1140,4 @@
                 self.assertEqual(response_content,
                                  session.get_redirect_target(req))
             elif response_content:
-                self.assertEqual(six.text_type(response_content), req.text)
+                self.assertEqual(str(response_content), req.text)

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index e5b93b8..8376df6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,6 @@
 python-barbicanclient>=4.5.2 # Apache-2.0
 pyOpenSSL>=17.1.0 # Apache-2.0
 requests>=2.14.2  # Apache-2.0
-six>=1.10.0 # MIT
 tempest>=17.1.0 # Apache-2.0
 tenacity>=4.4.0 # Apache-2.0
 testtools>=2.2.0 # MIT