From 24b43522a4f7f4294d2b5e3df18586c81476a984 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Thu, 18 Nov 2021 15:20:31 +0100 Subject: [PATCH] linting --- dotdrop/cfg_yaml.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dotdrop/cfg_yaml.py b/dotdrop/cfg_yaml.py index 02eb736..43d2981 100644 --- a/dotdrop/cfg_yaml.py +++ b/dotdrop/cfg_yaml.py @@ -1444,17 +1444,17 @@ class CfgYaml: return {**low, **high} final = high.copy() - for k, v in low.items(): - if isinstance(v, dict): + for k, val in low.items(): + if isinstance(val, dict): # content is dict, recurse if k not in final: final[k] = {} - final[k] = cls._merge_dict(v, final[k], deep=True) - elif isinstance(v, list): + final[k] = cls._merge_dict(val, final[k], deep=True) + elif isinstance(val, list): # content is list, merge if k not in final: final[k] = [] - final[k] += v + final[k] += val else: # don't know how to handle err = 'unable to merge'