Revision e11ddf13 lib/objects.py
b/lib/objects.py | ||
---|---|---|
48 | 48 |
_TIMESTAMPS = ["ctime", "mtime"] |
49 | 49 |
_UUID = ["uuid"] |
50 | 50 |
|
51 |
def FillDict(defaults_dict, custom_dict, skip_keys=[]):
|
|
51 |
def FillDict(defaults_dict, custom_dict, skip_keys=None):
|
|
52 | 52 |
"""Basic function to apply settings on top a default dict. |
53 | 53 |
|
54 | 54 |
@type defaults_dict: dict |
... | ... | |
63 | 63 |
""" |
64 | 64 |
ret_dict = copy.deepcopy(defaults_dict) |
65 | 65 |
ret_dict.update(custom_dict) |
66 |
for k in skip_keys: |
|
67 |
try: |
|
68 |
del ret_dict[k] |
|
69 |
except KeyError: |
|
70 |
pass |
|
66 |
if skip_keys: |
|
67 |
for k in skip_keys: |
|
68 |
try: |
|
69 |
del ret_dict[k] |
|
70 |
except KeyError: |
|
71 |
pass |
|
71 | 72 |
return ret_dict |
72 | 73 |
|
73 | 74 |
|
Also available in: Unified diff