We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
2 parents 41ee689 + 4a69920 commit ba93a11Copy full SHA for ba93a11
hwinfo/util/__init__.py
@@ -52,15 +52,15 @@ def parse_item(self, item):
52
matches = [m.groupdict() for m in re.finditer(regex, item)]
53
mdicts = combine_dicts(matches)
54
if mdicts:
55
- rec = dict(rec.items() + mdicts.items())
+ rec = dict(list(rec.items()) + list(mdicts.items()))
56
return rec
57
58
def parse_items(self):
59
if not self.ITEM_SEPERATOR:
60
return [self.parse_item(self.DATA)]
61
else:
62
recs = []
63
- for data in self.DATA.split(self.ITEM_SEPERATOR):
+ for data in self.DATA.decode().split(self.ITEM_SEPERATOR):
64
rec = self.parse_item(data)
65
recs.append(rec)
66
return recs
0 commit comments