#8564: Fix deepmerge logic to allow nullifying dicts

2022-02-11 15:22:50 -05:00 · 2022-02-11 15:22:50 -05:00 · e1ef911d40
parent a4ca585ef2
commit e1ef911d40
1 changed files with 1 additions and 1 deletions
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@ -183,7 +183,7 @@ def deepmerge(original, new):
    """
    merged = OrderedDict(original)
    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)
        else:
            merged[key] = val