diff options
| author | Victor Stinner <vstinner@redhat.com> | 2015-06-12 10:05:02 +0200 |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2015-06-12 18:11:42 +0200 |
| commit | 4a392ca17d93847fd0ce8da70c8c4b750b4481c9 (patch) | |
| tree | 7bae8a1c44a5f37320510cc6e9ead1baea95c0a1 /ceilometer/ipmi | |
| parent | 5977295dafc914406c765398e234dfcfd48d7766 (diff) | |
| download | ceilometer-4a392ca17d93847fd0ce8da70c8c4b750b4481c9.tar.gz | |
Port IPMI to Python 3
binascii.hexlify() returns a byte string whereas the code expects a
native string, so Unicode on Python 3. On Python 3, decode the string
from ASCII to get Unicode.
Enable ipmi tests in tox.ini on Python 3.4.
Change-Id: I154723ad42efb61a06b71600975374441920a852
Diffstat (limited to 'ceilometer/ipmi')
| -rw-r--r-- | ceilometer/ipmi/platform/intel_node_manager.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py index ca07849b..4bb91a8a 100644 --- a/ceilometer/ipmi/platform/intel_node_manager.py +++ b/ceilometer/ipmi/platform/intel_node_manager.py @@ -27,6 +27,7 @@ import tempfile import time from oslo_config import cfg +import six from ceilometer.i18n import _ from ceilometer.ipmi.platform import exception as nmexcept @@ -181,6 +182,8 @@ class NodeManager(object): for line in bin_fp.readlines(): if line: data_str = binascii.hexlify(line) + if six.PY3: + data_str = data_str.decode('ascii') if prefix in data_str: oem_id_index = data_str.index(prefix) ret = data_str[oem_id_index + len(prefix): |