comparison piecrust/configuration.py @ 78:c80a3be091da 2.0.0-alpha3

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 30 Aug 2014 17:37:46 -0700
parents d9e494df2a99
children d64e4703f5e6
comparison
equal deleted inserted replaced
77:25bfed36a620 78:c80a3be091da
122 config = {} 122 config = {}
123 offset = 0 123 offset = 0
124 return config, offset 124 return config, offset
125 125
126 126
127 class OrderedDictYAMLLoader(yaml.BaseLoader): 127 class OrderedDictYAMLLoader(yaml.SafeLoader):
128 """ A YAML loader that loads mappings into ordered dictionaries. 128 """ A YAML loader that loads mappings into ordered dictionaries.
129 """ 129 """
130 def construct_mapping(self, node, deep=False): 130 def construct_mapping(self, node, deep=False):
131 if not isinstance(node, yaml.MappingNode): 131 if not isinstance(node, yaml.MappingNode):
132 raise ConstructorError(None, None, 132 raise ConstructorError(None, None,