From 82c5e55fe45bb15ff10f7a051eba5faddab34f2f Mon Sep 17 00:00:00 2001 From: allegroai <> Date: Wed, 7 Apr 2021 21:30:13 +0300 Subject: [PATCH] Fix usage of not_set in k8s template merge --- clearml_agent/helper/dicts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clearml_agent/helper/dicts.py b/clearml_agent/helper/dicts.py index 4417b6e..4fc4cbd 100644 --- a/clearml_agent/helper/dicts.py +++ b/clearml_agent/helper/dicts.py @@ -17,7 +17,7 @@ def merge_dicts(dict1, dict2, custom_merge_func=None): res = None if custom_merge_func: res = custom_merge_func(k, dict1[k], dict2[k], _not_set) - dict1[k] = merge_dicts(dict1[k], dict2[k], custom_merge_func) if res is None else res + dict1[k] = merge_dicts(dict1[k], dict2[k], custom_merge_func) if res is _not_set else res else: dict1[k] = dict2[k] return dict1