python · Avasam · Jan 10, 2023 · Jan 11, 2023 · Jan 12, 2023 · Jan 12, 2023
diff --git a/stubs/openpyxl/openpyxl/cell/cell.pyi b/stubs/openpyxl/openpyxl/cell/cell.pyi
@@ -1,4 +1,4 @@
-import datetime
+from datetime import date, datetime, time, timedelta
 from decimal import Decimal
 from re import Pattern
 from typing import overload
@@ -13,17 +13,18 @@ from openpyxl.workbook.child import _WorkbookChild
 from openpyxl.worksheet.formula import ArrayFormula, DataTableFormula
 from openpyxl.worksheet.hyperlink import Hyperlink
 
-_TimeTypes: TypeAlias = datetime.datetime | datetime.date | datetime.time | datetime.timedelta
+_TimeTypes: TypeAlias = datetime | date | time | timedelta
 _CellValue: TypeAlias = (  # if numpy is installed also numpy bool and number types
        bool | float | Decimal | str | CellRichText | _TimeTypes | DataTableFormula | ArrayFormula
 )
 
-TIME_TYPES: tuple[type, ...]
-TIME_FORMATS: dict[type[_TimeTypes], str]
-STRING_TYPES: tuple[type, ...]
-KNOWN_TYPES: tuple[type, ...]
+__docformat__: Final = "restructuredtext en"
+TIME_TYPES: Final[tuple[type, ...]]
+TIME_FORMATS: Final[dict[type[_TimeTypes], str]]
+STRING_TYPES: Final[tuple[type, ...]]
+KNOWN_TYPES: Final[tuple[type, ...]]
 
-ILLEGAL_CHARACTERS_RE: Pattern[str]
+ILLEGAL_CHARACTERS_RE: Final[Pattern[str]]
 ERROR_CODES: Final[tuple[str, ...]]
 
 TYPE_STRING: Final = "s"
@@ -61,7 +62,7 @@ class Cell(StyleableObject):
     @property
     def encoding(self) -> str: ...
     @property
-    def base_date(self) -> datetime.datetime: ...
+    def base_date(self) -> datetime: ...
     @overload
     def check_string(self, value: None) -> None: ...
     @overload

diff --git a/stubs/openpyxl/openpyxl/cell/text.pyi b/stubs/openpyxl/openpyxl/cell/text.pyi
@@ -6,7 +6,7 @@ from openpyxl.descriptors.base import Alias, Integer, NoneSet, Typed, _Convertib
 from openpyxl.descriptors.nested import NestedString, NestedText
 from openpyxl.descriptors.serialisable import Serialisable
 from openpyxl.styles.colors import Color
-from openpyxl.styles.fonts import Font, _UnderlineType
+from openpyxl.styles.fonts import Font, _FontU
 
 _PhoneticPropertiesType: TypeAlias = Literal["halfwidthKatakana", "fullwidthKatakana", "Hiragana", "noConversion"]
 _PhoneticPropertiesAlignment: TypeAlias = Literal["noControl", "left", "center", "distributed"]
@@ -64,7 +64,7 @@ class InlineFont(Font):
         extend: bool | None = None,
         color: Color | None = None,
         sz: float | None = None,
-        u: _UnderlineType = None,
+        u: _FontU | None = None,
         vertAlign: Literal["superscript", "subscript", "baseline", None] = None,
         scheme: Literal["major", "minor", None] = None,
     ) -> None: ...

diff --git a/stubs/openpyxl/openpyxl/compat/numbers.pyi b/stubs/openpyxl/openpyxl/compat/numbers.pyi
@@ -1,5 +1,5 @@
 from decimal import Decimal
-from typing_extensions import TypeAlias
+from typing_extensions import Final, TypeAlias
 
 # NOTE: Can't specify numpy as a dependency because openpyxl doesn't declare it as one
 # import numpy
@@ -12,6 +12,6 @@ from typing_extensions import TypeAlias
 # _NumericTypes: TypeAlias = int | float | Decimal | numpy.bool_ | numpy.floating[_NBitBase] | numpy.integer[_NBitBase]
 
 _NumericTypes: TypeAlias = int | float | Decimal
-NUMERIC_TYPES: tuple[type[_NumericTypes], ...]
+NUMERIC_TYPES: Final[tuple[type[_NumericTypes], ...]]
 
-NUMPY: bool
+NUMPY: Final[bool]
diff --git a/stubs/openpyxl/openpyxl/descriptors/base.pyi b/stubs/openpyxl/openpyxl/descriptors/base.pyi
@@ -35,7 +35,6 @@ class Typed(Descriptor[_T], Generic[_T, _N]):
     expected_type: type[_T]
     allow_none: _N
     nested: bool
-    __doc__: str
 
     @overload
     def __init__(

diff --git a/stubs/openpyxl/openpyxl/reader/excel.pyi b/stubs/openpyxl/openpyxl/reader/excel.pyi
@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, StrPath
 from typing import IO
-from typing_extensions import Final
+from typing_extensions import Final, Literal, TypeAlias
 from zipfile import ZipFile
 
 from openpyxl.chartsheet.chartsheet import Chartsheet
@@ -9,7 +9,8 @@ from openpyxl.packaging.relationship import Relationship
 from openpyxl.reader.workbook import WorkbookParser
 from openpyxl.workbook import Workbook
 
-SUPPORTED_FORMATS: Final[tuple[str, ...]]
+_SupportedFormats: TypeAlias = Literal[".xlsx", ".xlsm", ".xltx", ".xltm"]
+SUPPORTED_FORMATS: Final[tuple[_SupportedFormats, ...]]
 
 class ExcelReader:
     archive: ZipFile

diff --git a/stubs/openpyxl/openpyxl/styles/alignment.pyi b/stubs/openpyxl/openpyxl/styles/alignment.pyi
@@ -15,7 +15,7 @@ horizontal_alignments: Final[tuple[_HorizontalAlignmentsType, ...]]
 vertical_aligments: Final[tuple[_VerticalAlignmentsType, ...]]
 
 class Alignment(Serialisable):
-    tagname: str
+    tagname: ClassVar[str]
     __fields__: ClassVar[tuple[str, ...]]
     horizontal: NoneSet[_HorizontalAlignmentsType]
     vertical: NoneSet[_VerticalAlignmentsType]

diff --git a/stubs/openpyxl/openpyxl/styles/borders.pyi b/stubs/openpyxl/openpyxl/styles/borders.pyi
@@ -6,21 +6,6 @@ from typing_extensions import Final, Literal, TypeAlias
 from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable
 
-BORDER_NONE: None
-BORDER_DASHDOT: Final = "dashDot"
-BORDER_DASHDOTDOT: Final = "dashDotDot"
-BORDER_DASHED: Final = "dashed"
-BORDER_DOTTED: Final = "dotted"
-BORDER_DOUBLE: Final = "double"
-BORDER_HAIR: Final = "hair"
-BORDER_MEDIUM: Final = "medium"
-BORDER_MEDIUMDASHDOT: Final = "mediumDashDot"
-BORDER_MEDIUMDASHDOTDOT: Final = "mediumDashDotDot"
-BORDER_MEDIUMDASHED: Final = "mediumDashed"
-BORDER_SLANTDASHDOT: Final = "slantDashDot"
-BORDER_THICK: Final = "thick"
-BORDER_THIN: Final = "thin"
-
 _SideStyle: TypeAlias = Literal[
     "dashDot",
     "dashDotDot",
@@ -37,6 +22,21 @@ _SideStyle: TypeAlias = Literal[
     "thin",
 ]
 
+BORDER_NONE: Final = None
+BORDER_DASHDOT: Final = "dashDot"
+BORDER_DASHDOTDOT: Final = "dashDotDot"
+BORDER_DASHED: Final = "dashed"
+BORDER_DOTTED: Final = "dotted"
+BORDER_DOUBLE: Final = "double"
+BORDER_HAIR: Final = "hair"
+BORDER_MEDIUM: Final = "medium"
+BORDER_MEDIUMDASHDOT: Final = "mediumDashDot"
+BORDER_MEDIUMDASHDOTDOT: Final = "mediumDashDotDot"
+BORDER_MEDIUMDASHED: Final = "mediumDashed"
+BORDER_SLANTDASHDOT: Final = "slantDashDot"
+BORDER_THICK: Final = "thick"
+BORDER_THIN: Final = "thin"
+
 class Side(Serialisable):
     __fields__: ClassVar[tuple[str, ...]]
     color: Incomplete
@@ -50,7 +50,7 @@ class Side(Serialisable):
     ) -> None: ...
 
 class Border(Serialisable):
-    tagname: str
+    tagname: ClassVar[str]
     __fields__: ClassVar[tuple[str, ...]]
     __elements__: ClassVar[tuple[str, ...]]
     start: Typed[Side, Literal[True]]
@@ -84,4 +84,4 @@ class Border(Serialisable):
     ) -> None: ...
     def __iter__(self) -> Generator[tuple[str, str], None, None]: ...
 
-DEFAULT_BORDER: Border
+DEFAULT_BORDER: Final[Border]
diff --git a/stubs/openpyxl/openpyxl/styles/colors.pyi b/stubs/openpyxl/openpyxl/styles/colors.pyi
@@ -2,19 +2,19 @@ from _typeshed import Incomplete, Unused
 from collections.abc import Generator
 from re import Pattern
 from typing import ClassVar, TypeVar, overload
-from typing_extensions import Literal, Self
+from typing_extensions import Final, Literal, Self
 
 from openpyxl.descriptors import Strict, Typed
 from openpyxl.descriptors.base import Bool, Integer, MinMax, String, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
 from openpyxl.descriptors.serialisable import Serialisable
 
 _S = TypeVar("_S", bound=Serialisable)

-COLOR_INDEX: tuple[str, ...]
-BLACK: str
-WHITE: str
-BLUE: str
-aRGB_REGEX: Pattern[str]
+COLOR_INDEX: Final[tuple[str, ...]]
+BLACK: Final = "00000000"
+WHITE: Final = "00FFFFFF"
+BLUE: Final = "00FFFFFF"
+aRGB_REGEX: Final[Pattern[str]]
 
 class RGB(Typed[str, Incomplete]):
     expected_type: type[str]
@@ -55,7 +55,7 @@ class ColorDescriptor(Typed[Color, Incomplete]):
     def __set__(self, instance: Serialisable | Strict, value) -> None: ...
 
 class RgbColor(Serialisable):
-    tagname: str
+    tagname: ClassVar[str]
     rgb: RGB
     def __init__(self, rgb: str) -> None: ...
 

diff --git a/stubs/openpyxl/openpyxl/styles/fills.pyi b/stubs/openpyxl/openpyxl/styles/fills.pyi
@@ -78,8 +78,8 @@ class PatternFill(Fill):
     ) -> None: ...
     def to_tree(self, tagname: Unused = None, idx: Unused = None): ...  # type: ignore[override]
 
-DEFAULT_EMPTY_FILL: PatternFill
-DEFAULT_GRAY_FILL: PatternFill
+DEFAULT_EMPTY_FILL: Final[PatternFill]
+DEFAULT_GRAY_FILL: Final[PatternFill]
 
 class Stop(Serialisable):
     tagname: ClassVar[str]

diff --git a/stubs/openpyxl/openpyxl/styles/fonts.pyi b/stubs/openpyxl/openpyxl/styles/fonts.pyi
@@ -75,4 +75,4 @@ class Font(Serialisable):
     @classmethod
     def from_tree(cls, node: _Element) -> Self: ...
 
-DEFAULT_FONT: Font
+DEFAULT_FONT: Final[Font]
diff --git a/stubs/openpyxl/openpyxl/styles/numbers.pyi b/stubs/openpyxl/openpyxl/styles/numbers.pyi
@@ -1,54 +1,55 @@
 from _typeshed import Incomplete, Unused
 from re import Pattern
 from typing import ClassVar, overload
-from typing_extensions import Literal, TypeGuard
+from typing_extensions import Final, Literal, TypeGuard
 
 from openpyxl.descriptors import Strict, String
 from openpyxl.descriptors.base import Integer, _ConvertibleToInt
 from openpyxl.descriptors.serialisable import Serialisable
 
-BUILTIN_FORMATS: dict[int, str]
-BUILTIN_FORMATS_MAX_SIZE: int
-BUILTIN_FORMATS_REVERSE: dict[str, int]
-FORMAT_GENERAL: str
-FORMAT_TEXT: str
-FORMAT_NUMBER: str
-FORMAT_NUMBER_00: str
-FORMAT_NUMBER_COMMA_SEPARATED1: str
-FORMAT_NUMBER_COMMA_SEPARATED2: str
-FORMAT_PERCENTAGE: str
-FORMAT_PERCENTAGE_00: str
-FORMAT_DATE_YYYYMMDD2: str
-FORMAT_DATE_YYMMDD: str
-FORMAT_DATE_DDMMYY: str
-FORMAT_DATE_DMYSLASH: str
-FORMAT_DATE_DMYMINUS: str
-FORMAT_DATE_DMMINUS: str
-FORMAT_DATE_MYMINUS: str
-FORMAT_DATE_XLSX14: str
-FORMAT_DATE_XLSX15: str
-FORMAT_DATE_XLSX16: str
-FORMAT_DATE_XLSX17: str
-FORMAT_DATE_XLSX22: str
-FORMAT_DATE_DATETIME: str
-FORMAT_DATE_TIME1: str
-FORMAT_DATE_TIME2: str
-FORMAT_DATE_TIME3: str
-FORMAT_DATE_TIME4: str
-FORMAT_DATE_TIME5: str
-FORMAT_DATE_TIME6: str
-FORMAT_DATE_TIME7: str
-FORMAT_DATE_TIME8: str
-FORMAT_DATE_TIMEDELTA: str
-FORMAT_DATE_YYMMDDSLASH: str
-FORMAT_CURRENCY_USD_SIMPLE: str
-FORMAT_CURRENCY_USD: str
-FORMAT_CURRENCY_EUR_SIMPLE: str
-COLORS: str
-LITERAL_GROUP: str
-LOCALE_GROUP: str
-STRIP_RE: Pattern[str]
-TIMEDELTA_RE: Pattern[str]
+BUILTIN_FORMATS: Final[dict[int, str]]
+BUILTIN_FORMATS_MAX_SIZE: Final = 164
+BUILTIN_FORMATS_REVERSE: Final[dict[str, int]]
+FORMAT_GENERAL: Final = "General"
+FORMAT_TEXT: Final = "@"
+FORMAT_NUMBER: Final = "0"
+FORMAT_NUMBER_00: Final = "0.00"
+FORMAT_NUMBER_COMMA_SEPARATED1: Final = "#,##0.00"
+FORMAT_NUMBER_COMMA_SEPARATED2: Final = "#,##0.00_-"
+FORMAT_PERCENTAGE: Final = "0%"
+FORMAT_PERCENTAGE_00: Final = "0.00%"
+FORMAT_DATE_YYYYMMDD2: Final = "yyyy-mm-dd"
+FORMAT_DATE_YYMMDD: Final = "yy-mm-dd"
+FORMAT_DATE_DDMMYY: Final = "dd/mm/yy"
+FORMAT_DATE_DMYSLASH: Final = "d/m/y"
+FORMAT_DATE_DMYMINUS: Final = "d-m-y"
+FORMAT_DATE_DMMINUS: Final = "d-m"
+FORMAT_DATE_MYMINUS: Final = "m-y"
+FORMAT_DATE_XLSX14: Final = "mm-dd-yy"
+FORMAT_DATE_XLSX15: Final = "d-mmm-yy"
+FORMAT_DATE_XLSX16: Final = "d-mmm"
+FORMAT_DATE_XLSX17: Final = "mmm-yy"
+FORMAT_DATE_XLSX22: Final = "m/d/yy h:mm"
+FORMAT_DATE_DATETIME: Final = "yyyy-mm-dd h:mm:ss"
+FORMAT_DATE_TIME1: Final = "h:mm AM/PM"
+FORMAT_DATE_TIME2: Final = "h:mm:ss AM/PM"
+FORMAT_DATE_TIME3: Final = "h:mm"
+FORMAT_DATE_TIME4: Final = "h:mm:ss"
+FORMAT_DATE_TIME5: Final = "mm:ss"
+FORMAT_DATE_TIME6: Final = "h:mm:ss"
+FORMAT_DATE_TIME7: Final = "i:s.S"
+FORMAT_DATE_TIME8: Final = "h:mm:ss@"
+FORMAT_DATE_TIMEDELTA: Final = "[hh]:mm:ss"
+FORMAT_DATE_YYMMDDSLASH: Final = "yy/mm/dd@"
+FORMAT_CURRENCY_USD_SIMPLE: Final = '"$"#,##0.00_-'
+FORMAT_CURRENCY_USD: Final = "$#,##0_-"
+FORMAT_CURRENCY_EUR_SIMPLE: Final = "[$EUR ]#,##0.00_-"
+
+COLORS: Final[str]
+LITERAL_GROUP: Final = r'".*?"'
+LOCALE_GROUP: Final = r"\[(?!hh?\]|mm?\]|ss?\])[^\]]*\]"
+STRIP_RE: Final[Pattern[str]]
+TIMEDELTA_RE: Final[Pattern[str]]
 
 def is_date_format(fmt: str | None) -> TypeGuard[str]: ...
 def is_timedelta_format(fmt): ...

diff --git a/stubs/openpyxl/openpyxl/styles/protection.pyi b/stubs/openpyxl/openpyxl/styles/protection.pyi
@@ -1,14 +1,10 @@
-from openpyxl.descriptors.base import _ConvertibleToBool
+from typing_extensions import Literal
+
+from openpyxl.descriptors.base import Bool, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable
 
 class Protection(Serialisable):
     tagname: str
-    @property
-    def locked(self) -> bool: ...
-    @locked.setter
-    def locked(self, __value: _ConvertibleToBool) -> None: ...
-    @property
-    def hidden(self) -> bool: ...
-    @hidden.setter
-    def hidden(self, __value: _ConvertibleToBool) -> None: ...
+    locked: Bool[Literal[False]]
+    hidden: Bool[Literal[False]]
     def __init__(self, locked: _ConvertibleToBool = True, hidden: _ConvertibleToBool = False) -> None: ...
diff --git a/stubs/openpyxl/openpyxl/utils/cell.pyi b/stubs/openpyxl/openpyxl/utils/cell.pyi
@@ -1,13 +1,14 @@
 from collections.abc import Generator
 from re import Pattern
+from typing_extensions import Final
 
-COORD_RE: Pattern[bytes]
-COL_RANGE: str
-ROW_RANGE: str
-RANGE_EXPR: str
-ABSOLUTE_RE: Pattern[bytes]
-SHEET_TITLE: str
-SHEETRANGE_RE: Pattern[bytes]
+COORD_RE: Final[Pattern[str]]
+COL_RANGE: Final = """[A-Z]{1,3}:[A-Z]{1,3}:"""
+ROW_RANGE: Final = r"""\d+:\d+:"""
+RANGE_EXPR: Final[str]
+ABSOLUTE_RE: Final[Pattern[str]]
+SHEET_TITLE: Final[str]
+SHEETRANGE_RE: Final[Pattern[str]]
 
 def get_column_interval(start: str | int, end: str | int) -> list[str]: ...
 def coordinate_from_string(coord_string: str) -> tuple[str, int]: ...

diff --git a/stubs/openpyxl/openpyxl/workbook/child.pyi b/stubs/openpyxl/openpyxl/workbook/child.pyi
@@ -1,11 +1,12 @@
 from collections.abc import Iterable
 from re import Pattern
+from typing_extensions import Final
 
 from openpyxl import _Decodable
 from openpyxl.workbook.workbook import Workbook
 from openpyxl.worksheet.header_footer import HeaderFooter
 
-INVALID_TITLE_REGEX: Pattern[str]
+INVALID_TITLE_REGEX: Final[Pattern[str]]
 
 def avoid_duplicate_name(names: Iterable[str], value: str) -> str: ...
 

diff --git a/stubs/openpyxl/openpyxl/workbook/views.pyi b/stubs/openpyxl/openpyxl/workbook/views.pyi
@@ -11,7 +11,7 @@ _CustomWorkbookViewShowComments: TypeAlias = Literal["commNone", "commIndicator"
 _CustomWorkbookViewShowObjects: TypeAlias = Literal["all", "placeholders"]
 
 class BookView(Serialisable):
-    tagname: str
+    tagname: ClassVar[str]
     visibility: NoneSet[_VisibilityType]
     minimized: Bool[Literal[True]]
     showHorizontalScroll: Bool[Literal[True]]

diff --git a/stubs/openpyxl/openpyxl/workbook/web.pyi b/stubs/openpyxl/openpyxl/workbook/web.pyi
@@ -50,7 +50,9 @@ class WebPublishObject(Serialisable):
     ) -> None: ...
 
 class WebPublishObjectList(Serialisable):
-    tagname: str
+    tagname: ClassVar[str]
+    # Overwritten by property below
+    # count: Integer
     webPublishObject: Incomplete
     __elements__: ClassVar[tuple[str, ...]]
     def __init__(self, count: Unused = None, webPublishObject=()) -> None: ...