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/api/base.py

diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index dd25062..648c9f8 100755
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -18,7 +18,6 @@
 import traceback
 
 from oslo_log import log
-import six
 from tempest import config
 from tempest.lib.common import cred_client
 from tempest.lib.common.utils import data_utils
@@ -636,8 +635,8 @@
         extra_specs = {}
         for k, v in share_type['extra_specs'].items():
             extra_specs[k] = (
-                True if six.text_type(v).lower() == 'true'
-                else False if six.text_type(v).lower() == 'false' else v
+                True if str(v).lower() == 'true'
+                else False if str(v).lower() == 'false' else v
             )
         return [
             pool for pool in pools if all(y in pool['capabilities'].items()
@@ -1077,7 +1076,7 @@
     @staticmethod
     def add_extra_specs_to_dict(extra_specs=None):
         """Add any required extra-specs to share type dictionary"""
-        dhss = six.text_type(CONF.share.multitenancy_enabled)
+        dhss = str(CONF.share.multitenancy_enabled)
         extra_specs_dict = {"driver_handles_share_servers": dhss}
         if extra_specs:
             extra_specs_dict.update(extra_specs)