Improve vol.Invalid handling (#120480)

This commit is contained in:
Marc Mueller 2024-06-26 02:13:09 +02:00 committed by GitHub
parent ec2f98d075
commit 0bc597f8c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View File

@ -47,7 +47,7 @@ class InvalidBlueprint(BlueprintWithNameException):
domain: str | None,
blueprint_name: str | None,
blueprint_data: Any,
msg_or_exc: vol.Invalid,
msg_or_exc: str | vol.Invalid,
) -> None:
"""Initialize an invalid blueprint error."""
if isinstance(msg_or_exc, vol.Invalid):

View File

@ -70,11 +70,11 @@ class LogbookView(HomeAssistantView):
if entity_ids_str := request.query.get("entity"):
try:
entity_ids = cv.entity_ids(entity_ids_str)
except vol.Invalid:
except vol.Invalid as ex:
raise InvalidEntityFormatError(
f"Invalid entity id(s) encountered: {entity_ids_str}. "
"Format should be <domain>.<object_id>"
) from vol.Invalid
) from ex
else:
entity_ids = None

View File

@ -157,7 +157,7 @@ class SetupEntity(Protocol):
@callback
def async_handle_schema_error(
discovery_payload: MQTTDiscoveryPayload, err: vol.MultipleInvalid
discovery_payload: MQTTDiscoveryPayload, err: vol.Invalid
) -> None:
"""Help handling schema errors on MQTT discovery messages."""
discovery_topic: str = discovery_payload.discovery_data[ATTR_DISCOVERY_TOPIC]