tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-27 15:54:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add mergedefaults function that does not override existing keys

Browse Source
This commit is contained in:
ZyX 2014-08-29 18:40:25 +04:00
parent e609bdf514
commit 8fb09bd8b3
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
powerline/lib/__init__.py
View File

@ -15,7 +15,9 @@ def wraps_saveargs(wrapped):
def mergedicts(d1, d2): def mergedicts(d1, d2):
'''Recursively merge two dictionaries. First dictionary is modified in-place. '''Recursively merge two dictionaries
First dictionary is modified in-place.
''' '''
for k in d2: for k in d2:
if k in d1 and isinstance(d1[k], dict) and isinstance(d2[k], dict): if k in d1 and isinstance(d1[k], dict) and isinstance(d2[k], dict):
@ -26,6 +28,18 @@ def mergedicts(d1, d2):
d1[k] = d2[k] d1[k] = d2[k]
def mergedefaults(d1, d2):
'''Recursively merge two dictionaries, keeping existing values
First dictionary is modified in-place.
'''
for k in d2:
if k in d1 and isinstance(d1[k], dict) and isinstance(d2[k], dict):
mergedefaults(d1[k], d2[k])
else:
d1.setdefault(k, d2[k])
def mergedicts_copy(d1, d2): def mergedicts_copy(d1, d2):
'''Recursively merge two dictionaries. '''Recursively merge two dictionaries.