Skip to content

Fix AttributeError when node.id is accessed on non-Node objects #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
veeceey wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix AttributeError when node.id is accessed on non-Node objects #911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/yaml/constructor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,23 @@ def construct_object(self, node, deep=False):
def construct_scalar(self, node):
if not isinstance(node, ScalarNode):
raise ConstructorError(None, None,
"expected a scalar node, but found %s" % node.id,
node.start_mark)
"expected a scalar node, but found %s" % getattr(node, 'id', type(node).__name__),
getattr(node, 'start_mark', None))
return node.value

def construct_sequence(self, node, deep=False):
if not isinstance(node, SequenceNode):
raise ConstructorError(None, None,
"expected a sequence node, but found %s" % node.id,
node.start_mark)
"expected a sequence node, but found %s" % getattr(node, 'id', type(node).__name__),
getattr(node, 'start_mark', None))
return [self.construct_object(child, deep=deep)
for child in node.value]

def construct_mapping(self, node, deep=False):
if not isinstance(node, MappingNode):
raise ConstructorError(None, None,
"expected a mapping node, but found %s" % node.id,
node.start_mark)
"expected a mapping node, but found %s" % getattr(node, 'id', type(node).__name__),
getattr(node, 'start_mark', None))
mapping = {}
for key_node, value_node in node.value:
key = self.construct_object(key_node, deep=deep)
Expand All @@ -147,8 +147,8 @@ def construct_mapping(self, node, deep=False):
def construct_pairs(self, node, deep=False):
if not isinstance(node, MappingNode):
raise ConstructorError(None, None,
"expected a mapping node, but found %s" % node.id,
node.start_mark)
"expected a mapping node, but found %s" % getattr(node, 'id', type(node).__name__),
getattr(node, 'start_mark', None))
pairs = []
for key_node, value_node in node.value:
key = self.construct_object(key_node, deep=deep)
Expand Down Expand Up @@ -356,8 +356,8 @@ def construct_yaml_omap(self, node):
omap = []
yield omap
if not isinstance(node, SequenceNode):
raise ConstructorError("while constructing an ordered map", node.start_mark,
"expected a sequence, but found %s" % node.id, node.start_mark)
raise ConstructorError("while constructing an ordered map", getattr(node, 'start_mark', None),
"expected a sequence, but found %s" % getattr(node, 'id', type(node).__name__), getattr(node, 'start_mark', None))
for subnode in node.value:
if not isinstance(subnode, MappingNode):
raise ConstructorError("while constructing an ordered map", node.start_mark,
Expand All @@ -377,8 +377,8 @@ def construct_yaml_pairs(self, node):
pairs = []
yield pairs
if not isinstance(node, SequenceNode):
raise ConstructorError("while constructing pairs", node.start_mark,
"expected a sequence, but found %s" % node.id, node.start_mark)
raise ConstructorError("while constructing pairs", getattr(node, 'start_mark', None),
"expected a sequence, but found %s" % getattr(node, 'id', type(node).__name__), getattr(node, 'start_mark', None))
for subnode in node.value:
if not isinstance(subnode, MappingNode):
raise ConstructorError("while constructing pairs", node.start_mark,
Expand Down