xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-28 11:57:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix python2.6 usage of unpack_from

Browse Source 
unpack_from in python 2.6 can't handle a bytearray.  Make it a buffer
before trying to unpack_from

Change-Id: I0b1014eba7b1001e79edb2bee1e1dc5b59eda36c
This commit is contained in:
Jarrod Johnson 2015-05-15 16:08:45 -04:00
parent 369463eb9f
commit 329e9fc188
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyghmi/ipmi/events.py
View File

@ -442,7 +442,8 @@ class EventHandler(object):
event = {}
if selentry[2] == 2 or (0xc0 <= selentry[2] <= 0xdf):
# Either standard, or at least the timestamp is standard
event['timecode'] = struct.unpack_from('<I', selentry[3:7])[0]
event['timecode'] = struct.unpack_from('<I', buffer(selentry[3:7])
)[0]
if selentry[2] == 2: # ipmi defined standard format
self._decode_standard_event(selentry[7:], event)
elif 0xc0 <= selentry[2] <= 0xdf:
@ -469,7 +470,7 @@ class EventHandler(object):
except pygexc.IpmiException as pi:
if pi.ipmicode == 203:
break
curr = struct.unpack_from('<H', rsp['data'][:2])[0]
curr = struct.unpack_from('<H', buffer(rsp['data'][:2]))[0]
targetlist.append(self._sel_decode(rsp['data'][2:]))
return endat