openstack/cinder
Code Issues Proposed changes

Merge "Drop six"

Browse Source
This commit is contained in:
Zuul 2024-06-21 23:32:27 +00:00 committed by Gerrit Code Review
commit 869195167e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/volume/drivers/inspur/instorage/instorage_iscsi.py
View File

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

1
requirements.txt
View File

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