internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

correctly deals with non serializable type

Browse Source 
combine_vars shoudl really be data types, but some just get in
in test, add dict to mock and avoid combine_vars using object
This commit is contained in:
Brian Coca
2016-01-18 15:08:07 -05:00
parent 83069a38d5
commit 27f4730c29
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/utils/vars.py
View File

@@ -28,7 +28,8 @@ from ansible.compat.six import iteritems, string_types
from ansible import constants as C
from ansible.errors import AnsibleError
from ansible.parsing.splitter import parse_kv
from ansible.utils.unicode import to_unicode
from ansible.utils.unicode import to_unicode, to_str
def _validate_mutable_mappings(a, b):
"""
@@ -43,8 +44,14 @@ def _validate_mutable_mappings(a, b):
# a variable number of arguments instead.
if not (isinstance(a, MutableMapping) and isinstance(b, MutableMapping)):
myvars = []
for x in [a, b]:
try:
myvars.append(dumps(x))
except:
myvars.append(to_str(x))
raise AnsibleError("failed to combine variables, expected dicts but got a '{0}' and a '{1}': \n{2}\n{3}".format(
a.__class__.__name__, b.__class__.__name__, dumps(a), dumps(b))
a.__class__.__name__, b.__class__.__name__, myvars[0], myvars[1])
)
def combine_vars(a, b):