NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

#8564: Fix deepmerge logic to allow nullifying dicts

Browse Source
This commit is contained in:
jeremystretch 2022-02-11 15:22:50 -05:00
parent a4ca585ef2
commit e1ef911d40
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/utils.py
View File

@ -183,7 +183,7 @@ def deepmerge(original, new):
""" """
merged = OrderedDict(original) merged = OrderedDict(original)
for key, val in new.items(): for key, val in new.items():
if key in original and isinstance(original[key], dict) and isinstance(val, dict): if key in original and isinstance(original[key], dict) and val and isinstance(val, dict):
merged[key] = deepmerge(original[key], val) merged[key] = deepmerge(original[key], val)
else: else:
merged[key] = val merged[key] = val