Commit 18bae795 authored by Jérome Perrin's avatar Jérome Perrin

core: support deepdiff 6.7.1

parent e26d3ae2
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
# #
############################################################################## ##############################################################################
import six
if six.PY3:
from collections.abc import Set
else:
from collections import Set
import difflib import difflib
import warnings import warnings
try: try:
...@@ -144,7 +149,7 @@ class PortalPatch(Explicit): ...@@ -144,7 +149,7 @@ class PortalPatch(Explicit):
# Flatten the list of DiffValues # Flatten the list of DiffValues
for key, subset in tree_diff.items(): for key, subset in tree_diff.items():
if isinstance(subset, set): if isinstance(subset, Set):
sublist = list(subset) sublist = list(subset)
for item in sublist: for item in sublist:
# XXX: This is important as the subsets with iterable item removed # XXX: This is important as the subsets with iterable item removed
...@@ -192,9 +197,9 @@ class PortalPatch(Explicit): ...@@ -192,9 +197,9 @@ class PortalPatch(Explicit):
else: else:
old_value = val.t1 old_value = val.t1
new_value = val.t2 new_value = val.t2
if (val.t1 == None) or isinstance(val.t1, deepdiff.helper.NotPresent): if (val.t1 is None) or isinstance(val.t1, deepdiff.helper.NotPresent):
old_value = '' old_value = ''
if (val.t2 == None) or isinstance(val.t2, deepdiff.helper.NotPresent): if (val.t2 is None) or isinstance(val.t2, deepdiff.helper.NotPresent):
new_value = '' new_value = ''
# Deepdiff doesn't creates diff for anything other than string, thus for all other cases, # Deepdiff doesn't creates diff for anything other than string, thus for all other cases,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment