cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix in dict_merge to check for Mapping

Browse source 
*  Based on review comments for PR #49474 change the check
   for isinstance from `dict` to `Mapping`
This commit is contained in:
Ganesh B Nalawade 2018-12-05 08:44:14 +05:30 committed by Toshio Kuratomi
parent 77de219836
commit 329cbcf973
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/module_utils/network/common/utils.py
View file

@ -37,6 +37,7 @@ from itertools import chain
from socket import inet_aton from socket import inet_aton
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.common._collections_compat import Mapping
from ansible.module_utils.six import iteritems, string_types from ansible.module_utils.six import iteritems, string_types
from ansible.module_utils.basic import AnsibleFallbackNotFound from ansible.module_utils.basic import AnsibleFallbackNotFound
@ -301,7 +302,7 @@ def dict_merge(base, other):
if key in other: if key in other:
item = other.get(key) item = other.get(key)
if item is not None: if item is not None:
if isinstance(other[key], dict): if isinstance(other[key], Mapping):
combined[key] = dict_merge(value, other[key]) combined[key] = dict_merge(value, other[key])
else: else:
combined[key] = other[key] combined[key] = other[key]