saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Raise a typeerror if non-dict types

Browse source
This commit is contained in:
Colton Myers 2015-05-30 13:54:43 -06:00
parent be21aaa122
commit 0c4832c0d4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/dictupdate.py
View file

@ -25,8 +25,9 @@ def update(dest, upd, recursive_update=True):
If recursive_update=False, will use the classic dict.update, or fall back
on a manual merge (helpful for non-dict types like FunctionWrapper)
'''
if dest is None:
return upd
if (not isinstance(dest, collections.Mapping)) \
or (not isinstance(upd, collections.Mapping)):
raise TypeError('Cannot update using non-dict types in dictupdate.update()')
updkeys = list(upd.keys())
if not set(list(dest.keys())) & set(updkeys):
recursive_update = False