valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Py3 compatability

Browse Source
This commit is contained in:
Pedro Algarvio 2015-01-07 05:46:11 +00:00
parent 87e2cfcf4d
commit 4953576266
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/dictupdate.py
View File

@ -3,10 +3,12 @@
Alex Martelli's soulution for recursive dict update from
http://stackoverflow.com/a/3233356
'''
from __future__ import absolute_import
# Import python libs
from __future__ import absolute_import
import collections
# Import 3rd-party libs
import salt.ext.six as six
@ -22,9 +24,9 @@ def update(dest, upd):
def merge(d1, d2):
md = {}
for k, v in d1.iteritems():
if k in d2:
md[k] = [v, d2[k]]
for key, val in six.iteritems(d1):
if key in d2:
md[key] = [val, d2[key]]
else:
md[k] = v
md[key] = val
return md