Mercurial > piecrust2

comparison piecrust/configuration.py @ 978:7e51d14097cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: Properly pass the merge mode to the `merge_dicts` function.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 29 Oct 2017 22:46:41 -0700
parents f070a4fc033c
children c0c00dc1eac7
comparison
equal deleted inserted replaced
977:84fc72a17f7a 978:7e51d14097cb
81 else: 81 else:
82 raise Exception( 82 raise Exception(
83 "Unsupported value type to merge: %s" % type(other)) 83 "Unsupported value type to merge: %s" % type(other))
84 84
85 merge_dicts(self._values, other_values, 85 merge_dicts(self._values, other_values,
86 mode=mode,
86 validator=self._validateValue) 87 validator=self._validateValue)
87 88
88 def validateTypes(self, allowed_types=default_allowed_types): 89 def validateTypes(self, allowed_types=default_allowed_types):
89 self._validateDictTypesRecursive(self._values, allowed_types) 90 self._validateDictTypesRecursive(self._values, allowed_types)
90 91