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 compat. Cast to list which works in Py2 and Py3.

Browse Source
This commit is contained in:
Pedro Algarvio 2017-03-31 18:41:43 +01:00
parent a15aa32404
commit 5d160f38c9
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/utils/dictdiffer.py
View File

@ -30,7 +30,7 @@ class DictDiffer(object):
"""
def __init__(self, current_dict, past_dict):
self.current_dict, self.past_dict = current_dict, past_dict
self.set_current, self.set_past = set(current_dict.keys()), set(past_dict.keys())
self.set_current, self.set_past = set(list(current_dict)), set(list(past_dict))
self.intersect = self.set_current.intersection(self.set_past)
def added(self):
@ -56,7 +56,7 @@ def deep_diff(old, new, ignore=None):
while len(stack) > 0:
tmps = []
tmp_old, tmp_new, reentrant = stack.pop()
for key in set(tmp_old.keys() + tmp_new.keys()):
for key in set(list(tmp_old) + list(tmp_new)):
if key in tmp_old and key in tmp_new \
and tmp_old[key] == tmp_new[key]:
del tmp_old[key]