From 5c65b125912f2a3c21c7c79096835a0bcaa067f3 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Jun 2024 09:23:38 +0200 Subject: [PATCH] [openpyxl] Fix key of Worksheet.row_dimensions (#12143) Closes: #11845 --- stubs/openpyxl/openpyxl/worksheet/dimensions.pyi | 7 ++++--- stubs/openpyxl/openpyxl/worksheet/worksheet.pyi | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi index 644e5684a..6a338deeb 100644 --- a/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/dimensions.pyi @@ -1,6 +1,6 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused from collections.abc import Callable, Iterator -from typing import ClassVar, Generic, Literal, TypeVar +from typing import ClassVar, Literal, TypeVar from typing_extensions import Self from openpyxl.descriptors import Strict @@ -12,6 +12,7 @@ from openpyxl.utils.cell import _RangeBoundariesTuple from openpyxl.worksheet.worksheet import Worksheet from openpyxl.xml.functions import Element +_DimKeyT = TypeVar("_DimKeyT", bound=str | int) _DimT = TypeVar("_DimT", bound=Dimension) class Dimension(Strict, StyleableObject): @@ -103,7 +104,7 @@ class ColumnDimension(Dimension): def reindex(self) -> None: ... def to_tree(self) -> Element | None: ... -class DimensionHolder(BoundDictionary[str, _DimT], Generic[_DimT]): +class DimensionHolder(BoundDictionary[_DimKeyT, _DimT]): worksheet: Worksheet max_outline: int | None default_factory: Callable[[], _DimT] | None @@ -111,7 +112,7 @@ class DimensionHolder(BoundDictionary[str, _DimT], Generic[_DimT]): def __init__( self, worksheet: Worksheet, reference: str = "index", default_factory: Callable[[], _DimT] | None = None ) -> None: ... - def group(self, start: str, end: str | None = None, outline_level: int = 1, hidden: bool = False) -> None: ... + def group(self, start: _DimKeyT, end: _DimKeyT | None = None, outline_level: int = 1, hidden: bool = False) -> None: ... def to_tree(self) -> Element | None: ... class SheetFormatProperties(Serialisable): diff --git a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi index 4adb8a835..f1930d010 100644 --- a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi @@ -51,8 +51,8 @@ class Worksheet(_WorkbookChild): ORIENTATION_PORTRAIT: Final = "portrait" ORIENTATION_LANDSCAPE: Final = "landscape" - row_dimensions: DimensionHolder[RowDimension] - column_dimensions: DimensionHolder[ColumnDimension] + row_dimensions: DimensionHolder[int, RowDimension] + column_dimensions: DimensionHolder[str, ColumnDimension] row_breaks: RowBreak col_breaks: ColBreak merged_cells: MultiCellRange