From a7da4d93d8764159b51f3a82102ae164244977d3 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sun, 29 May 2022 15:34:27 +0100 Subject: [PATCH 1/3] jsonschema: {relative,absolute}_path can hold ints --- stubs/jsonschema/jsonschema/exceptions.pyi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stubs/jsonschema/jsonschema/exceptions.pyi b/stubs/jsonschema/jsonschema/exceptions.pyi index 0c6fc5290a4b..6f6b2db625f7 100644 --- a/stubs/jsonschema/jsonschema/exceptions.pyi +++ b/stubs/jsonschema/jsonschema/exceptions.pyi @@ -1,7 +1,7 @@ from _typeshed import Self, SupportsRichComparison from collections import deque from collections.abc import Callable, Container, Iterable, Sequence -from typing import Any +from typing import Any, Union from jsonschema import _utils, protocols @@ -12,8 +12,8 @@ STRONG_MATCHES: frozenset[str] class _Error(Exception): message: str - path: deque[str] - relative_path: deque[str] + path: deque[str|int] + relative_path: deque[str|int] schema_path: deque[str] relative_schema_path: deque[str] context: list[ValidationError] | None @@ -27,7 +27,7 @@ class _Error(Exception): self, message: str, validator: _utils.Unset | None | protocols.Validator = ..., - path: Sequence[str] = ..., + path: Sequence[str|int] = ..., cause: Any | None = ..., context: Sequence[ValidationError] = ..., validator_value=..., @@ -39,7 +39,7 @@ class _Error(Exception): @classmethod def create_from(cls: type[Self], other: _Error) -> Self: ... @property - def absolute_path(self) -> Sequence[str]: ... + def absolute_path(self) -> Sequence[Union[str|int]]: ... @property def absolute_schema_path(self) -> Sequence[str]: ... @property From ff6f1b47039368b8e1733b60414fcc4e80f07ad5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 29 May 2022 14:43:07 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/jsonschema/jsonschema/exceptions.pyi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stubs/jsonschema/jsonschema/exceptions.pyi b/stubs/jsonschema/jsonschema/exceptions.pyi index 6f6b2db625f7..e21313c8b593 100644 --- a/stubs/jsonschema/jsonschema/exceptions.pyi +++ b/stubs/jsonschema/jsonschema/exceptions.pyi @@ -12,8 +12,8 @@ STRONG_MATCHES: frozenset[str] class _Error(Exception): message: str - path: deque[str|int] - relative_path: deque[str|int] + path: deque[str | int] + relative_path: deque[str | int] schema_path: deque[str] relative_schema_path: deque[str] context: list[ValidationError] | None @@ -27,7 +27,7 @@ class _Error(Exception): self, message: str, validator: _utils.Unset | None | protocols.Validator = ..., - path: Sequence[str|int] = ..., + path: Sequence[str | int] = ..., cause: Any | None = ..., context: Sequence[ValidationError] = ..., validator_value=..., @@ -39,7 +39,7 @@ class _Error(Exception): @classmethod def create_from(cls: type[Self], other: _Error) -> Self: ... @property - def absolute_path(self) -> Sequence[Union[str|int]]: ... + def absolute_path(self) -> Sequence[Union[str | int]]: ... @property def absolute_schema_path(self) -> Sequence[str]: ... @property From 83a515bf94127c9371603ab0478d12f90e6632e6 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Sun, 29 May 2022 15:34:27 +0100 Subject: [PATCH 3/3] Remove redundant `Union`. Not used to the `x|y` syntax --- stubs/jsonschema/jsonschema/exceptions.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/jsonschema/jsonschema/exceptions.pyi b/stubs/jsonschema/jsonschema/exceptions.pyi index e21313c8b593..19ba3fc9d780 100644 --- a/stubs/jsonschema/jsonschema/exceptions.pyi +++ b/stubs/jsonschema/jsonschema/exceptions.pyi @@ -1,7 +1,7 @@ from _typeshed import Self, SupportsRichComparison from collections import deque from collections.abc import Callable, Container, Iterable, Sequence -from typing import Any, Union +from typing import Any from jsonschema import _utils, protocols @@ -39,7 +39,7 @@ class _Error(Exception): @classmethod def create_from(cls: type[Self], other: _Error) -> Self: ... @property - def absolute_path(self) -> Sequence[Union[str | int]]: ... + def absolute_path(self) -> Sequence[str | int]: ... @property def absolute_schema_path(self) -> Sequence[str]: ... @property