Mercurial > hgrepos > Python > libs > ConfigMix

comparison configmix/__init__.py @ 214:a35b0ca8b81f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Docu: Sphinx markup
author Franz Glasner <fzglas.hg@dom66.de>
date Wed, 08 May 2019 09:17:55 +0200
parents 657cf709463b
children c03c9162f7e6
comparison
equal deleted inserted replaced
213:5031fc1ae5df 214:a35b0ca8b81f
50 50
51 :param files: the filenames of the configuration files to read and merge 51 :param files: the filenames of the configuration files to read and merge
52 :keyword defaults: optional configuration dictionary with some default 52 :keyword defaults: optional configuration dictionary with some default
53 settings where the settings from `files` are merged 53 settings where the settings from `files` are merged
54 into 54 into
55 :type defaults: a configuration dictionary or `None` 55 :type defaults: dict-alike or None
56 :returns: the configuration 56 :returns: the configuration
57 :rtype: ~configmix.config.Configuration 57 :rtype: ~configmix.config.Configuration
58 58
59 """ 59 """
60 defaults = kwargs.get("defaults") 60 defaults = kwargs.get("defaults")