From 033915f83255bc2152edaecabdf2d36ec076b81a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 25 May 2024 00:24:53 +0900 Subject: [PATCH] Drop six Remove the remaining usage of the six library so that it can be removed from requirements. Change-Id: Ie27f31bbfbb0fc6d3fd24ff247c8809121f5bb19 --- cinder/volume/drivers/inspur/instorage/instorage_iscsi.py | 3 +-- requirements.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py b/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py index b69448eac55..64bbd07a42f 100644 --- a/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py +++ b/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) diff --git a/requirements.txt b/requirements.txt index 7ad69029aad..0b72917cbc2 100644 --- a/requirements.txt +++ b/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