Commit b48b631e authored by Gabriel Monnerat's avatar Gabriel Monnerat

Merge branch 'master', remote branch 'origin' into slave_instance

parents 9964c960 e58b02c7
...@@ -253,6 +253,9 @@ def _syncComputerPartitionInformation(func): ...@@ -253,6 +253,9 @@ def _syncComputerPartitionInformation(func):
for elt in inv: for elt in inv:
if isinstance(elt, (list, tuple)): if isinstance(elt, (list, tuple)):
new_inv.append([x.encode('utf-8') for x in elt]) new_inv.append([x.encode('utf-8') for x in elt])
elif isinstance(elt, dict):
new_inv.append(dict([(x.encode('utf-8'),
y and y.encode("utf-8")) for x,y in elt.iteritems()]))
else: else:
new_inv.append(elt.encode('utf-8')) new_inv.append(elt.encode('utf-8'))
new_dict[ink.encode('utf-8')] = new_inv new_dict[ink.encode('utf-8')] = new_inv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment