Skip to content
Closed
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
25 changes: 21 additions & 4 deletions src/attr/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,13 @@ def __call__(self, inst, attr, value):
if self.iterable_validator is not None:
self.iterable_validator(inst, attr, value)

for member in value:
self.member_validator(inst, attr, member)
for idx, member in enumerate(value):
try:
self.member_validator(inst, attr, member)
except (ValueError, TypeError) as e:
# Re-raise with context about which member failed
msg = str(e).replace(f"'{attr.name}'", f"'{attr.name}[{idx}]'")
raise type(e)(msg) from None

def __repr__(self):
iterable_identifier = (
Expand Down Expand Up @@ -399,9 +404,21 @@ def __call__(self, inst, attr, value):

for key in value:
if self.key_validator is not None:
self.key_validator(inst, attr, key)
try:
self.key_validator(inst, attr, key)
except (ValueError, TypeError) as e:
msg = str(e).replace(
f"'{attr.name}'", f"'{attr.name}[key:{key!r}]'"
)
raise type(e)(msg) from None
if self.value_validator is not None:
self.value_validator(inst, attr, value[key])
try:
self.value_validator(inst, attr, value[key])
except (ValueError, TypeError) as e:
msg = str(e).replace(
f"'{attr.name}'", f"'{attr.name}[{key!r}]'"
)
raise type(e)(msg) from None

def __repr__(self):
return f"<deep_mapping validator for objects mapping {self.key_validator!r} to {self.value_validator!r}>"
Expand Down
Loading