dev-linux
Ivan Maslov 4 years ago
parent 4e3260c879
commit cfe6a70c25

@ -50,7 +50,7 @@ def __ComplexDictMerge2to1Overwrite__(in1Dict, in2Dict):
for lKeyStr in in2Dict: for lKeyStr in in2Dict:
if lKeyStr in in1Dict: if lKeyStr in in1Dict:
if isinstance(in1Dict[lKeyStr], dict) and isinstance(in2Dict[lKeyStr], dict): if isinstance(in1Dict[lKeyStr], dict) and isinstance(in2Dict[lKeyStr], dict):
__ComplexDictMerge2to1__(in1Dict[lKeyStr], in2Dict[lKeyStr]) __ComplexDictMerge2to1Overwrite__(in1Dict[lKeyStr], in2Dict[lKeyStr])
else: else:
in1Dict[lKeyStr] = in2Dict[lKeyStr] in1Dict[lKeyStr] = in2Dict[lKeyStr]
else: else:

Loading…
Cancel
Save