From 3183582e6aa948163aac71a4a81910f64471d4a1 Mon Sep 17 00:00:00 2001 From: Antoni Szych Date: Mon, 11 Dec 2023 19:31:53 +0100 Subject: [PATCH] fix: allow path to be a list of strings as well as integers --- voluptuous/error.py | 16 +++++++++++----- voluptuous/humanize.py | 5 +---- voluptuous/validators.py | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/voluptuous/error.py b/voluptuous/error.py index 2789880..7ff016f 100644 --- a/voluptuous/error.py +++ b/voluptuous/error.py @@ -19,7 +19,13 @@ class Invalid(Error): """ - def __init__(self, message: str, path: typing.Optional[typing.List[str]] = None, error_message: typing.Optional[str] = None, error_type: typing.Optional[str] = None) -> None: + def __init__( + self, + message: str, + path: typing.Optional[typing.List[typing.Union[str, int]]] = None, + error_message: typing.Optional[str] = None, + error_type: typing.Optional[str] = None + ) -> None: Error.__init__(self, message) self._path = path or [] self._error_message = error_message or message @@ -30,7 +36,7 @@ def msg(self) -> str: return self.args[0] @property - def path(self) -> typing.List[str]: + def path(self) -> typing.List[typing.Union[str, int]]: return self._path @property @@ -45,7 +51,7 @@ def __str__(self) -> str: output += ' for ' + self.error_type return output + path - def prepend(self, path: typing.List[str]) -> None: + def prepend(self, path: typing.List[typing.Union[str, int]]) -> None: self._path = path + self.path @@ -61,7 +67,7 @@ def msg(self) -> str: return self.errors[0].msg @property - def path(self) -> typing.List[str]: + def path(self) -> typing.List[typing.Union[str, int]]: return self.errors[0].path @property @@ -74,7 +80,7 @@ def add(self, error: Invalid) -> None: def __str__(self) -> str: return str(self.errors[0]) - def prepend(self, path: typing.List[str]) -> None: + def prepend(self, path: typing.List[typing.Union[str, int]]) -> None: for error in self.errors: error.prepend(path) diff --git a/voluptuous/humanize.py b/voluptuous/humanize.py index 734f367..7553832 100644 --- a/voluptuous/humanize.py +++ b/voluptuous/humanize.py @@ -7,10 +7,7 @@ MAX_VALIDATION_ERROR_ITEM_LENGTH = 500 -IndexT = typing.TypeVar("IndexT") - - -def _nested_getitem(data: typing.Dict[IndexT, typing.Any], path: typing.List[IndexT]) -> typing.Optional[typing.Any]: +def _nested_getitem(data: typing.Any, path: typing.List[typing.Union[str, int]]) -> typing.Optional[typing.Any]: for item_index in path: try: data = data[item_index] diff --git a/voluptuous/validators.py b/voluptuous/validators.py index 776adb8..8ad8e1d 100644 --- a/voluptuous/validators.py +++ b/voluptuous/validators.py @@ -224,7 +224,7 @@ def __voluptuous_compile__(self, schema: Schema) -> typing.Callable: schema.required = old_required return self._run - def _run(self, path: typing.List[str], value): + def _run(self, path: typing.List[typing.Union[str, int]], value): if self.discriminant is not None: self._compiled = [ self.schema._compile(v) @@ -243,7 +243,7 @@ def __repr__(self): self.msg ) - def _exec(self, funcs: typing.Iterable, v, path: typing.Optional[typing.List[str]] = None): + def _exec(self, funcs: typing.Iterable, v, path: typing.Optional[typing.List[typing.Union[str, int]]] = None): raise NotImplementedError()