diff options
| author | kuangcx <kuangcx@inspur.com> | 2020-11-02 14:37:26 +0800 |
|---|---|---|
| committer | Matthias Runge <mrunge@redhat.com> | 2021-01-13 14:20:31 +0100 |
| commit | c0632ae9e0f2eecbf0da9578c88f7c85727244f8 (patch) | |
| tree | 1aeec729f311f6c17d9b251770605902b006aa2a /ceilometer/ipmi | |
| parent | 71f3d092acaa56f0edb49bcd26814d4f67f953b4 (diff) | |
| download | ceilometer-c0632ae9e0f2eecbf0da9578c88f7c85727244f8.tar.gz | |
Replace six with python3 code style
Co-authored by: Matthias Runge <mrunge@redhat.com>
Change-Id: I85a4d79396874670f1b36cb91cfba5da812c2839
Diffstat (limited to 'ceilometer/ipmi')
| -rw-r--r-- | ceilometer/ipmi/platform/intel_node_manager.py | 4 | ||||
| -rw-r--r-- | ceilometer/ipmi/pollsters/node.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py index dcb25af7..2641a218 100644 --- a/ceilometer/ipmi/platform/intel_node_manager.py +++ b/ceilometer/ipmi/platform/intel_node_manager.py @@ -28,7 +28,6 @@ import threading import time from oslo_config import cfg -import six from ceilometer.i18n import _ from ceilometer.ipmi.platform import exception as nmexcept @@ -178,8 +177,7 @@ class NodeManager(object): with open(file_path, 'rb') as bin_fp: data_str = binascii.hexlify(bin_fp.read()) - if six.PY3: - data_str = data_str.decode('ascii') + data_str = data_str.decode('ascii') oem_id_index = data_str.find(prefix) if oem_id_index != -1: ret = data_str[oem_id_index + len(prefix): diff --git a/ceilometer/ipmi/pollsters/node.py b/ceilometer/ipmi/pollsters/node.py index 16e85a9b..c711bea5 100644 --- a/ceilometer/ipmi/pollsters/node.py +++ b/ceilometer/ipmi/pollsters/node.py @@ -15,7 +15,6 @@ import abc from oslo_log import log -import six from ceilometer.i18n import _ from ceilometer.ipmi.platform import exception as nmexcept @@ -26,8 +25,7 @@ from ceilometer import sample LOG = log.getLogger(__name__) -@six.add_metaclass(abc.ABCMeta) -class _Base(plugin_base.PollsterBase): +class _Base(plugin_base.PollsterBase, metaclass=abc.ABCMeta): def setup_environment(self): super(_Base, self).setup_environment() |