Skip to content

Fix AttributeError in constructor error handling (fixes #907) #927

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
r266-tech wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix AttributeError in constructor error handling (fixes #907) #927

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
8 changes: 4 additions & 4 deletions lib/yaml/constructor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,22 +117,22 @@ 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,
"expected a scalar node, but found %s" % getattr(node, 'id', type(node).__name__),
node.start_mark)
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,
"expected a sequence node, but found %s" % getattr(node, 'id', type(node).__name__),
node.start_mark)
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,
"expected a mapping node, but found %s" % getattr(node, 'id', type(node).__name__),
node.start_mark)
mapping = {}
for key_node, value_node in node.value:
Expand All @@ -147,7 +147,7 @@ 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,
"expected a mapping node, but found %s" % getattr(node, 'id', type(node).__name__),
node.start_mark)
pairs = []
for key_node, value_node in node.value:
Expand Down