summaryrefslogtreecommitdiff
path: root/ironic/drivers/modules/irmc/common.py
diff options
context:
space:
mode:
authorRiccardo Pittau <elfosardo@gmail.com>2019-11-29 10:16:28 +0100
committerRiccardo Pittau <elfosardo@gmail.com>2019-12-23 09:38:25 +0100
commit78c121a5d7b6efc84d541ea4de98aa910255884e (patch)
treef60d0b75107c58f14ed99f81ef9c6831ecb2feea /ironic/drivers/modules/irmc/common.py
parent67f5a6bf5c8922a56d70daae023a004e672a88db (diff)
downloadironic-78c121a5d7b6efc84d541ea4de98aa910255884e.tar.gz
Stop using six library
Since we've dropped support for Python 2.7, it's time to look at the bright future that Python 3.x will bring and stop forcing compatibility with older versions. This patch removes the six library from requirements, not looking back. Change-Id: Ib546f16965475c32b2f8caabd560e2c7d382ac5a
Diffstat (limited to 'ironic/drivers/modules/irmc/common.py')
-rw-r--r--ironic/drivers/modules/irmc/common.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py
index 9f04d74e1..8f81f8cec 100644
--- a/ironic/drivers/modules/irmc/common.py
+++ b/ironic/drivers/modules/irmc/common.py
@@ -17,7 +17,6 @@ Common functionalities shared between different iRMC modules.
"""
from oslo_log import log as logging
from oslo_utils import importutils
-import six
from ironic.common import exception
from ironic.common.i18n import _
@@ -113,13 +112,13 @@ def parse_driver_info(node):
d_info['irmc_snmp_port'])
if (d_info['irmc_snmp_version'].lower() in ('v1', 'v2c')
and d_info['irmc_snmp_community']
- and not isinstance(d_info['irmc_snmp_community'], six.string_types)):
+ and not isinstance(d_info['irmc_snmp_community'], str)):
error_msgs.append(
_("Value '%s' is not a string for 'irmc_snmp_community'") %
d_info['irmc_snmp_community'])
if d_info['irmc_snmp_version'].lower() == 'v3':
if d_info['irmc_snmp_security']:
- if not isinstance(d_info['irmc_snmp_security'], six.string_types):
+ if not isinstance(d_info['irmc_snmp_security'], str):
error_msgs.append(
_("Value '%s' is not a string for "
"'irmc_snmp_security'") % d_info['irmc_snmp_security'])