ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Make combine_vars() compatible with Python 3

Browse source 
Fixes

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

on Python 3.
This commit is contained in:
Marius Gedminas 2015-09-01 09:39:59 +03:00
parent 5adcd7054b
commit 54dbfba8f8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/vars.py
View file

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

4
lib/ansible/vars/__init__.py
View file

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