fixes error in dict_merge when merging list value (#35461)

pull/35507/head
Peter Sprygada 7 years ago committed by GitHub
parent 359ff19484
commit 2f7d207d7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -284,7 +284,11 @@ def dict_merge(base, other):
if key in other: if key in other:
item = other.get(key) item = other.get(key)
if item is not None: if item is not None:
try:
combined[key] = list(set(chain(value, item))) combined[key] = list(set(chain(value, item)))
except TypeError:
value.extend([i for i in item if i not in value])
combined[key] = value
else: else:
combined[key] = item combined[key] = item
else: else:

Loading…
Cancel
Save