From bd587263755716f3de4987ae177e97fc28e957c0 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Wed, 6 May 2020 13:21:06 +0800 Subject: [PATCH] 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 | 3 +-- requirements.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py index 741bb1c3..f7b73768 100644 --- a/octavia_tempest_plugin/tests/test_base.py +++ b/octavia_tempest_plugin/tests/test_base.py @@ -18,7 +18,6 @@ import pkg_resources import random import requests import shlex -import six import socket import string import subprocess @@ -1130,4 +1129,4 @@ class LoadBalancerBaseTestWithCompute(LoadBalancerBaseTest): 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) diff --git a/requirements.txt b/requirements.txt index b30b4501..3dfa266b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,6 @@ oslotest>=3.2.0 # Apache-2.0 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