commit 48895819769e94ae050a08275fa6a9606ef16b73
author haixin <haixin@inspur.com> Wed Sep 30 13:50:37 2020 +0800
committer haixin <haix09@chinatelecom.cn> Thu Dec 09 16:50:57 2021 +0800
tree 973ccfcc4f4a7f8cc88e0263a990978c12eb0b4c
parent 8866127d8b9bc7c2811c9025be8acf2228adb0f8

Remove all usage of six library

Replace six with Python 3 style code.

Change-Id: I724eba28d1a88317655f9cb7da94716772cd01ab

manila_tempest_tests/tests/scenario/manager.py

diff --git a/manila_tempest_tests/tests/scenario/manager.py b/manila_tempest_tests/tests/scenario/manager.py
index 1fa03f4..947d0e6 100644
--- a/manila_tempest_tests/tests/scenario/manager.py
+++ b/manila_tempest_tests/tests/scenario/manager.py
@@ -20,7 +20,6 @@
 from oslo_log import log
 from oslo_utils import netutils
 from oslo_utils import uuidutils
-import six
 from tempest.common import compute
 from tempest.common import image as common_image
 from tempest.common.utils.linux import remote_client
@@ -630,7 +629,7 @@
             try:
                 return subnets_client.create_subnet(**subnet)
             except lib_exc.Conflict as e:
-                if 'overlaps with another subnet' not in six.text_type(e):
+                if 'overlaps with another subnet' not in str(e):
                     raise
 
         result = None