Skip to content

Commit ba93a11

Browse files
authored
Merge pull request #19 from srgblnch/master
make python3 compatible the CommandParser().
2 parents 41ee689 + 4a69920 commit ba93a11

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

hwinfo/util/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ def parse_item(self, item):
5252
matches = [m.groupdict() for m in re.finditer(regex, item)]
5353
mdicts = combine_dicts(matches)
5454
if mdicts:
55-
rec = dict(rec.items() + mdicts.items())
55+
rec = dict(list(rec.items()) + list(mdicts.items()))
5656
return rec
5757

5858
def parse_items(self):
5959
if not self.ITEM_SEPERATOR:
6060
return [self.parse_item(self.DATA)]
6161
else:
6262
recs = []
63-
for data in self.DATA.split(self.ITEM_SEPERATOR):
63+
for data in self.DATA.decode().split(self.ITEM_SEPERATOR):
6464
rec = self.parse_item(data)
6565
recs.append(rec)
6666
return recs

0 commit comments

Comments
 (0)