pull/754/head
parent
190a72da8d
commit
36926953d6
|
@ -99,6 +99,14 @@ class ConfigurationLoader(object):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def merge_conf(base, delta):
|
def merge_conf(base, delta):
|
||||||
|
"""
|
||||||
|
Recursively merging configuration dictionaries.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
base: Target for merge
|
||||||
|
delta: Dictionary to merge into base
|
||||||
|
"""
|
||||||
|
|
||||||
for k, dv in delta.iteritems():
|
for k, dv in delta.iteritems():
|
||||||
bv = base.get(k)
|
bv = base.get(k)
|
||||||
if isinstance(dv, dict) and isinstance(bv, dict):
|
if isinstance(dv, dict) and isinstance(bv, dict):
|
||||||
|
|
Loading…
Reference in New Issue