Make combine_vars() compatible with Python 3

Fixes

  TypeError: unsupported operand type(s) for +: 'dict_items' and 'dict_items'

on Python 3.
pull/12177/head
Marius Gedminas 9 years ago
parent 5adcd7054b
commit 54dbfba8f8

@ -32,7 +32,9 @@ def combine_vars(a, b):
if C.DEFAULT_HASH_BEHAVIOUR == "merge":
return merge_hash(a, b)
else:
return dict(a.items() + b.items())
result = a.copy()
result.update(b)
return result
def merge_hash(a, b):
''' recursively merges hash b into a

@ -121,7 +121,9 @@ class VariableManager:
if C.DEFAULT_HASH_BEHAVIOUR == "merge":
return self._merge_dicts(a, b)
else:
return dict(a.items() + b.items())
result = a.copy()
result.update(b)
return result
def _merge_dicts(self, a, b):
'''

Loading…
Cancel
Save