Просмотр исходного кода

#8564: Fix deepmerge logic to allow nullifying dicts

jeremystretch 4 лет назад
Родитель
Сommit
e1ef911d40
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      netbox/utilities/utils.py

+ 1 - 1
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