|
|
@ -33,7 +33,7 @@ def __ComplexDictMerge2to1__(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], lPathList + [str(lKeyStr)])
|
|
|
|
__ComplexDictMerge2to1__(in1Dict[lKeyStr], in2Dict[lKeyStr])
|
|
|
|
elif in1Dict[lKeyStr] == in2Dict[lKeyStr]:
|
|
|
|
elif in1Dict[lKeyStr] == in2Dict[lKeyStr]:
|
|
|
|
pass # same leaf value
|
|
|
|
pass # same leaf value
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|