mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-12 04:13:59 +00:00
Code Activity

linting

Browse Source
This commit is contained in:
deadc0de6
2021-11-18 15:20:31 +01:00
parent eb3cdbca60
commit 24b43522a4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dotdrop/cfg_yaml.py
View File

@@ -1444,17 +1444,17 @@ class CfgYaml:
return {**low, **high} return {**low, **high}
final = high.copy() final = high.copy()
for k, v in low.items(): for k, val in low.items():
if isinstance(v, dict): if isinstance(val, dict):
# content is dict, recurse # content is dict, recurse
if k not in final: if k not in final:
final[k] = {} final[k] = {}
final[k] = cls._merge_dict(v, final[k], deep=True) final[k] = cls._merge_dict(val, final[k], deep=True)
elif isinstance(v, list): elif isinstance(val, list):
# content is list, merge # content is list, merge
if k not in final: if k not in final:
final[k] = [] final[k] = []
final[k] += v final[k] += val
else: else:
# don't know how to handle # don't know how to handle
err = 'unable to merge' err = 'unable to merge'