From 9883da3f453802330d9ab2edad9b47e299cd5987 Mon Sep 17 00:00:00 2001 From: Alexander Zinov <33320473+sashkent3@users.noreply.github.com> Date: Tue, 17 Sep 2024 17:59:50 +0300 Subject: [PATCH 1/2] `openpyxl`: fix `Worksheet.values` annotation --- stubs/openpyxl/openpyxl/worksheet/worksheet.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi index 42b34079c884..c348509e9048 100644 --- a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi @@ -150,7 +150,7 @@ class Worksheet(_WorkbookChild): @property def rows(self) -> Generator[tuple[Cell, ...], None, None]: ... @property - def values(self) -> Generator[tuple[_CellValue, ...], None, None]: ... + def values(self) -> Generator[tuple[_CellValue | None, ...], None, None]: ... @overload def iter_cols( self, min_col: int | None, max_col: int | None, min_row: int | None, max_row: int | None, values_only: Literal[True] From 89485363ef155a12570b5e5cc8796eca70f999d7 Mon Sep 17 00:00:00 2001 From: Alexander Zinov <33320473+sashkent3@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:07:38 +0300 Subject: [PATCH 2/2] `openpyxl`: remove optional `Generator` type arguments Co-authored-by: Sebastian Rittau --- stubs/openpyxl/openpyxl/worksheet/worksheet.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi index c348509e9048..0fd8a84ef379 100644 --- a/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi +++ b/stubs/openpyxl/openpyxl/worksheet/worksheet.pyi @@ -150,7 +150,7 @@ class Worksheet(_WorkbookChild): @property def rows(self) -> Generator[tuple[Cell, ...], None, None]: ... @property - def values(self) -> Generator[tuple[_CellValue | None, ...], None, None]: ... + def values(self) -> Generator[tuple[_CellValue | None, ...]]: ... @overload def iter_cols( self, min_col: int | None, max_col: int | None, min_row: int | None, max_row: int | None, values_only: Literal[True]