commit bd587263755716f3de4987ae177e97fc28e957c0
author jacky06 <zhang.min@99cloud.net> Wed May 06 13:21:06 2020 +0800
committer Brian Haley <bhaley@redhat.com> Mon Jul 13 14:17:57 2020 -0400
tree 7d1603ed0c756aac6921714824f593c2f8d42222
parent 47e4589d453ad69d94b004a1e335032481300b85

Remove all usage of six library

Convert all code to not require six library and instead
use python 3.x logic.

Change-Id: I9d5e9fce5d387c655c0bfc1bdcb699a1aa0f56a1

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 741bb1c..f7b7376 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
@@ -1130,4 +1129,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 b30b450..3dfa266 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
 keystoneauth1>=3.3.0 # Apache-2.0