Merge a24d4b3 into c71c0c5

ssato · Jun 8, 2018 · aa90062 · aa90062
2 parents c71c0c5 + a24d4b3
commit aa90062
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/anyconfig/backend/yaml.py b/anyconfig/backend/yaml.py
@@ -88,6 +88,7 @@ def construct_mapping(loader, node, deep=False):
         """Construct python object from yaml mapping node, based on
         :meth:`yaml.BaseConstructor.construct_mapping` in PyYAML (MIT).
         """
+        loader.flatten_mapping(node)
         if not isinstance(node, yaml.MappingNode):
             msg = "expected a mapping node, but found %s" % node.id
             raise yaml.constructor.ConstructorError(None, None, msg,

diff --git a/tests/backend/yaml.py b/tests/backend/yaml.py
@@ -22,12 +22,18 @@
   - 2
   - 3
 
-sect0:
+sect0: &sect0
   d: ["x", "y", "z"]
+sect1:
+  <<: *sect0
+  e: true
 """
 
 CNF = OrderedDict((("a", 0), ("b", "bbb"), ("c", [1, 2, 3]),
-                   ("sect0", OrderedDict((("d", "x y z".split()), )))))
+                   ("sect0", OrderedDict((("d", "x y z".split()), ))),
+                   ("sect1", OrderedDict((("d", "x y z".split()), ("e",
+                                                                   True),)))
+                   ))
 
 
 class HasParserTrait(TBC.HasParserTrait):