Mercurial > hgrepos > Python > libs > ConfigMix

comparison configmix/__init__.py @ 9:6835a5663008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Style
author Franz Glasner <f.glasner@feldmann-mg.com>
date Wed, 09 Mar 2016 11:09:33 +0100
parents 7090c295c940
children 58af59d5af40
comparison
equal deleted inserted replaced
8:7090c295c940 9:6835a5663008
33 if not isinstance(b, dict): 33 if not isinstance(b, dict):
34 return b 34 return b
35 result = deepcopy(a) 35 result = deepcopy(a)
36 for k, v in b.iteritems(): 36 for k, v in b.iteritems():
37 if k in result and isinstance(result[k], dict): 37 if k in result and isinstance(result[k], dict):
38 result[k] = dict_merge(result[k], v) 38 result[k] = dict_merge(result[k], v)
39 else: 39 else:
40 result[k] = deepcopy(v) 40 result[k] = deepcopy(v)
41 return result 41 return result
42 42
43 43
46 46
47 From http://stackoverflow.com/questions/823196/yaml-merge-in-python 47 From http://stackoverflow.com/questions/823196/yaml-merge-in-python
48 48
49 """ 49 """
50 if isinstance(user, dict) and isinstance(default, dict): 50 if isinstance(user, dict) and isinstance(default, dict):
51 for k,v in default.items(): 51 for k, v in default.items():
52 if k not in user: 52 if k not in user:
53 user[k] = v 53 user[k] = v
54 else: 54 else:
55 user[k] = merge(user[k], v) 55 user[k] = merge(user[k], v)
56 return user 56 return user