Merge pull request #1907 from braingram/load_yaml_tagged

use yaml constructors for _IgnoreCustomTagsLoader

Author: braingram

asdf/_tests/test_util.py

@@ -128,3 +128,21 @@ def test_load_yaml_recursion(tmp_path, tagged):
     tree = util.load_yaml(fn, tagged=tagged)
     assert tree["d"]["d"] is tree["d"]
     assert tree["l"][0] is tree["l"]
+
+
+@pytest.mark.parametrize("tagged", [True, False])
+def test_load_yaml_recursion_with_tags(tagged):
+    contents = b"""#ASDF 1.0.0
+#ASDF_STANDARD 1.6.0
+%YAML 1.1
+%TAG ! tag:stsci.edu:asdf/
+--- !core/asdf-1.1.0
+o: &id001 !some/tag-1.0.0
+  inverse: !some/tag-1.0.0
+    inverse: *id001
+l: &id002 !some/tag-1.0.0
+  - *id002
+..."""
+    tree = util.load_yaml(io.BytesIO(contents), tagged=tagged)
+    assert tree["o"] is tree["o"]["inverse"]["inverse"]
+    assert tree["l"] is tree["l"][0]

asdf/yamlutil.py

@@ -147,9 +147,9 @@ class _IgnoreCustomTagsLoader(_yaml_base_loader):
 
     def construct_undefined(self, node):
         if isinstance(node, yaml.MappingNode):
-            return self.construct_mapping(node)
+            return self.construct_yaml_map(node)
         elif isinstance(node, yaml.SequenceNode):
-            return self.construct_sequence(node)
+            return self.construct_yaml_seq(node)
         elif isinstance(node, yaml.ScalarNode):
             return self.construct_scalar(node)
         return super().construct_undefined(node)

changes/1907.bugfix.rst

@@ -0,0 +1 @@
+Support recursive tagged nodes in load_yaml.