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

py3 compat

Browse source
This commit is contained in:
Colton Myers 2015-05-29 18:04:26 -06:00
parent ff6b2a781f
commit c933249d1a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/dictupdate.py
View file

@ -28,7 +28,7 @@ def update(dest, upd, recursive_update=True):
'''
if dest is None:
return upd
if not (set(dest.keys()) & set(upd.keys())):
if not (set(list(dest.keys())) & set(list(upd.keys()))):
recursive_update = False
if recursive_update:
for key, val in six.iteritems(upd):