Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions jsonschema/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,13 @@ def __init__(self, errors: Iterable[ValidationError] = ()):
for error in errors:
container = self
for element in error.path:
container = container[element]
if element in container._contents:
container = container._contents[element]
else:
# Create a new child tree and add it to _contents
child = self.__class__()
container._contents[element] = child
container = child
container.errors[error.validator] = error

container._instance = error.instance
Expand All @@ -346,9 +352,13 @@ def __getitem__(self, index):
by ``instance.__getitem__`` will be propagated (usually this is
some subclass of `LookupError`.
"""
if self._instance is not _unset and index not in self:
if index in self._contents:
return self._contents[index]
if self._instance is not _unset:
# Validate the index exists in the instance
self._instance[index]
return self._contents[index]
# Return an empty tree without mutating _contents
return self.__class__()

def __setitem__(self, index: str | int, value: ErrorTree):
"""
Expand Down
75 changes: 75 additions & 0 deletions jsonschema/tests/test_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,81 @@ def test_repr_empty(self):
tree = exceptions.ErrorTree([])
self.assertEqual(repr(tree), "<ErrorTree (0 total errors)>")

def test_index_access_does_not_mutate_tree(self):
"""
Accessing an index that exists in the instance but has no error
should not add that index to the tree's iteration.

This is a regression test for issue #1328.
"""
error = exceptions.ValidationError(
"a message",
validator="foo",
instance={"foo": "bar", "baz": "qux"},
path=["foo"],
)
tree = exceptions.ErrorTree([error])

# Before access, only "foo" should be in the tree
self.assertEqual(set(tree), {"foo"})
self.assertIn("foo", tree)
self.assertNotIn("baz", tree)

# Access "baz" which exists in instance but has no error
child = tree["baz"]
self.assertIsInstance(child, exceptions.ErrorTree)

# After access, iteration should still only show "foo"
self.assertEqual(set(tree), {"foo"})
self.assertNotIn("baz", tree)

# Multiple accesses should also not mutate
tree["baz"]
tree["baz"]
self.assertEqual(set(tree), {"foo"})
self.assertNotIn("baz", tree)

def test_nested_index_access_does_not_mutate_tree(self):
"""
Accessing nested indices that have no error should not mutate
any level of the tree.
"""
e1 = exceptions.ValidationError(
"err1", validator="a", path=["bar", 0], instance={"bar": []},
)
e2 = exceptions.ValidationError(
"err2", validator="b", path=["bar", 1], instance={"bar": []},
)
tree = exceptions.ErrorTree([e1, e2])

# Before access
self.assertEqual(set(tree), {"bar"})
self.assertEqual(set(tree["bar"]), {0, 1})

# Access nested index that has no error
child = tree["bar"][2]
self.assertIsInstance(child, exceptions.ErrorTree)

# After access, neither level should be mutated
self.assertEqual(set(tree), {"bar"})
self.assertEqual(set(tree["bar"]), {0, 1})
self.assertNotIn(2, tree["bar"])

def test_index_access_on_empty_tree_returns_empty_tree(self):
"""
Accessing any index on an empty tree should return an empty tree
without mutating the original tree.
"""
tree = exceptions.ErrorTree([])

# Access an index (tree has no _instance, so no validation)
child = tree["anything"]
self.assertIsInstance(child, exceptions.ErrorTree)
self.assertEqual(len(child), 0)

# Tree should still be empty
self.assertEqual(set(tree), set())


class TestErrorInitReprStr(TestCase):
def make_error(self, **kwargs):
Expand Down
Loading