From 56481c19ecad26a818ef8b93e78a6e386d9599a4 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Fri, 30 May 2025 18:24:53 +0200 Subject: [PATCH 1/2] [openpyxl] Reorder overloads Should help with #14194 --- stubs/openpyxl/openpyxl/styles/colors.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stubs/openpyxl/openpyxl/styles/colors.pyi b/stubs/openpyxl/openpyxl/styles/colors.pyi index a9b5c4f58829..eb9ec718a6cf 100644 --- a/stubs/openpyxl/openpyxl/styles/colors.pyi +++ b/stubs/openpyxl/openpyxl/styles/colors.pyi @@ -66,11 +66,11 @@ class ColorDescriptor(Typed[Color, _N]): self: ColorDescriptor[Literal[False]], name: str | None = None, *, allow_none: Literal[False] = False ) -> None: ... @overload - def __set__(self: ColorDescriptor[_N], instance: Serialisable | Strict, value: str) -> None: ... - @overload def __set__(self: ColorDescriptor[Literal[True]], instance: Serialisable | Strict, value: Color | None) -> None: ... @overload def __set__(self: ColorDescriptor[Literal[False]], instance: Serialisable | Strict, value: Color) -> None: ... + @overload + def __set__(self: ColorDescriptor[_N], instance: Serialisable | Strict, value: str) -> None: ... class RgbColor(Serialisable): tagname: ClassVar[str] From 982cf371da950f26fa8dcf018b3dcfa4a478459d Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Sun, 1 Jun 2025 16:44:34 +0200 Subject: [PATCH 2/2] Update stubs/openpyxl/openpyxl/styles/colors.pyi Co-authored-by: Avasam --- stubs/openpyxl/openpyxl/styles/colors.pyi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/stubs/openpyxl/openpyxl/styles/colors.pyi b/stubs/openpyxl/openpyxl/styles/colors.pyi index eb9ec718a6cf..37ba17d847cd 100644 --- a/stubs/openpyxl/openpyxl/styles/colors.pyi +++ b/stubs/openpyxl/openpyxl/styles/colors.pyi @@ -66,11 +66,9 @@ class ColorDescriptor(Typed[Color, _N]): self: ColorDescriptor[Literal[False]], name: str | None = None, *, allow_none: Literal[False] = False ) -> None: ... @overload - def __set__(self: ColorDescriptor[Literal[True]], instance: Serialisable | Strict, value: Color | None) -> None: ... + def __set__(self: ColorDescriptor[Literal[True]], instance: Serialisable | Strict, value: str | Color | None) -> None: ... @overload - def __set__(self: ColorDescriptor[Literal[False]], instance: Serialisable | Strict, value: Color) -> None: ... - @overload - def __set__(self: ColorDescriptor[_N], instance: Serialisable | Strict, value: str) -> None: ... + def __set__(self: ColorDescriptor[Literal[False]], instance: Serialisable | Strict, value: str | Color) -> None: ... class RgbColor(Serialisable): tagname: ClassVar[str]