Merge "Drop six"

cinder/volume/drivers/inspur/instorage/instorage_iscsi.py

@@ -44,7 +44,6 @@ we must:
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
-import six
 
 from cinder import coordination
 from cinder import exception
@@ -207,7 +206,7 @@ class InStorageMCSISCSIDriver(instorage_common.InStorageMCSCommonDriver,
         except Exception as ex:
             msg = (_('_get_multi_iscsi_data: Failed to '
                      'get port ip because of exception: '
-                     '%s.') % six.text_type(ex))
+                     '%s.') % str(ex))
             LOG.error(msg)
             raise exception.VolumeBackendAPIException(data=msg)
 

requirements.txt

@@ -45,7 +45,6 @@ requests>=2.25.1 # Apache-2.0
 Routes>=2.4.1 # MIT
 taskflow>=4.5.0 # Apache-2.0
 rtslib-fb>=2.1.74 # Apache-2.0
-six>=1.15.0 # MIT
 SQLAlchemy>=1.4.23 # MIT
 stevedore>=3.2.2 # Apache-2.0
 tabulate>=0.8.7 # MIT