Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error in finding differences

Browse Source 
svn: r19996
This commit is contained in:
Doug Blank 2012-07-13 04:31:49 +00:00
parent d6fbdc43db
commit e03eaa26da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gen/merge/diff.py
View File

@ -94,7 +94,9 @@ def diff_items(path, json1, json2):
value1 = json1[key] value1 = json1[key]
value2 = json2[key] value2 = json2[key]
if isinstance(value1, dict) and isinstance(value2, dict): if isinstance(value1, dict) and isinstance(value2, dict):
retval = diff_items(path + "/" + key, value1, value2) result = diff_items(path + "/" + key, value1, value2)
if result:
retval = True
elif isinstance(value1, list) and isinstance(value2, list): elif isinstance(value1, list) and isinstance(value2, list):
pos = 0 pos = 0
for v1, v2 in zip(value1, value2): for v1, v2 in zip(value1, value2):