diff --git a/pyproject.toml b/pyproject.toml index 9b42e4a21..82fce1b83 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,4 +62,4 @@ all = true disable_all_dunder_policy = true [tool.typeshed] -pyright_version = "1.1.314" +pyright_version = "1.1.315" diff --git a/stubs/openpyxl/openpyxl/descriptors/base.pyi b/stubs/openpyxl/openpyxl/descriptors/base.pyi index 1360e48ed..6e62f1e88 100644 --- a/stubs/openpyxl/openpyxl/descriptors/base.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/base.pyi @@ -96,13 +96,13 @@ class Convertible(Typed[_T, _N]): # str | Blip @overload def __set__( - self: Convertible[str, bool] | Convertible[Blip, bool], + self: Convertible[str, _N] | Convertible[Blip, _N], instance: Serialisable | Strict, value: object, # Not[None] when _N = False ) -> None: ... # bool @overload - def __set__(self: Convertible[bool, bool], instance: Serialisable | Strict, value: _ConvertibleToBool) -> None: ... + def __set__(self: Convertible[bool, _N], instance: Serialisable | Strict, value: _ConvertibleToBool) -> None: ... # int @overload def __set__( diff --git a/stubs/openpyxl/openpyxl/descriptors/nested.pyi b/stubs/openpyxl/openpyxl/descriptors/nested.pyi index 7a68e909d..816ea570f 100644 --- a/stubs/openpyxl/openpyxl/descriptors/nested.pyi +++ b/stubs/openpyxl/openpyxl/descriptors/nested.pyi @@ -74,14 +74,14 @@ class NestedValue(Nested[_T], Convertible[_T, _N]): # type: ignore[misc] # str | Blip @overload def __set__( - self: NestedValue[str, bool] | NestedValue[Blip, bool], + self: NestedValue[str, _N] | NestedValue[Blip, _N], instance: Serialisable | Strict, value: object, # Not[None] when _N = False ) -> None: ... # bool @overload def __set__( - self: NestedValue[bool, bool], + self: NestedValue[bool, _N], instance: Serialisable | Strict, value: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool, ) -> None: ... @@ -145,21 +145,21 @@ class NestedText(NestedValue[_T, _N]): # str @overload def __set__( # type: ignore[misc] # Incompatible return type because of NoReturn - self: NestedValue[str, bool], instance: Serialisable | Strict, value: object # Not[None] when _N = False + self: NestedText[str, _N], instance: Serialisable | Strict, value: object # Not[None] when _N = False ) -> None: ... # int @overload def __set__( - self: NestedValue[int, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToInt | None + self: NestedText[int, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToInt | None ) -> None: ... @overload - def __set__(self: NestedValue[int, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToInt) -> None: ... + def __set__(self: NestedText[int, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToInt) -> None: ... # If expected type (_T) is not str, it's impossible to use an Element as the value @overload - def __set__(self: NestedValue[_T, Literal[True]], instance: Serialisable | Strict, value: _HasTagAndGet[Any]) -> NoReturn: ... + def __set__(self: NestedText[_T, Literal[True]], instance: Serialisable | Strict, value: _HasTagAndGet[Any]) -> NoReturn: ... # Anything else @overload - def __set__(self: NestedValue[_T, Literal[True]], instance: Serialisable | Strict, value: _T | int | Any | None) -> None: ... + def __set__(self: NestedText[_T, Literal[True]], instance: Serialisable | Strict, value: _T | int | Any | None) -> None: ... def from_tree(self, node: _HasTagAndText) -> str: ... # type: ignore[override] def to_tree(self, tagname: str | None = None, value: Incomplete | None = None, namespace: str | None = None) -> Element: ...