Mercurial > hgrepos > Python > libs > ConfigMix

comparison configmix/__init__.py @ 223:90dd0d04b926 v0.7.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
+++++ v0.7.1
author Franz Glasner <fzglas.hg@dom66.de>
date Fri, 10 May 2019 09:36:07 +0200
parents 6f0f39a9a46f
children 8b1c52d5e7d5
comparison
equal deleted inserted replaced
222:51a355095838 223:90dd0d04b926
11 """ 11 """
12 12
13 from __future__ import division, print_function, absolute_import 13 from __future__ import division, print_function, absolute_import
14 14
15 15
16 __version__ = "0.7.1.dev1" 16 __version__ = "0.7.1"
17 17
18 __revision__ = "|VCSRevision|" 18 __revision__ = "|VCSRevision|"
19 __date__ = "|VCSJustDate|" 19 __date__ = "|VCSJustDate|"
20 20
21 __all__ = ["load", "safe_load", 21 __all__ = ["load", "safe_load",
88 else: 88 else:
89 ex = safe_merge(None, Configuration(defaults)) 89 ex = safe_merge(None, Configuration(defaults))
90 for f in files: 90 for f in files:
91 ex = safe_merge(_load_cfg_from_file(f), ex) 91 ex = safe_merge(_load_cfg_from_file(f), ex)
92 if extras: 92 if extras:
93 ex = safe_merge(Configuration(extras), ex) 93 ex = safe_merge(Configuration(extras), ex)
94 return Configuration(ex) 94 return Configuration(ex)
95 95
96 96
97 def _load_yaml(filename): 97 def _load_yaml(filename):
98 from . import yaml 98 from . import yaml