fixes an issue with dict_merge in network utils (#41107)

This change address a problem where the dict_merge function would fail
due to the value being a nested dict.  This will now recursively pass
the value back through the dict_merge function.
pull/49290/head
Peter Sprygada 6 years ago committed by Ganesh Nalawade
parent c1a30c743e
commit 2a4be2748f

@ -301,7 +301,10 @@ 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:
combined[key] = dict_merge(value, other[key]) if isinstance(other[key], dict):
combined[key] = dict_merge(value, other[key])
else:
combined[key] = other[key]
else: else:
combined[key] = item combined[key] = item
else: else:

Loading…
Cancel
Save