Use ConvertibleToInt/ConvertibleToFloat in many third-party stubs (#11022)

Note: this may make the latest version of certain stubs packages incompatible with older versions of mypy and pyright.
This commit is contained in:
Avasam
2023-11-29 06:23:00 -05:00
committed by GitHub
parent 09668963a1
commit 4687faab8e
80 changed files with 831 additions and 970 deletions

View File

@@ -1,8 +1,8 @@
import sys
from _typeshed import Incomplete, ReadableBuffer, StrOrBytesPath, Unused
from _typeshed import ConvertibleToFloat, Incomplete, StrOrBytesPath, Unused
from collections.abc import Callable, Generator
from typing import NamedTuple, SupportsFloat, TypeVar, overload
from typing_extensions import Final, ParamSpec, SupportsIndex, TypeAlias
from typing import NamedTuple, TypeVar, overload
from typing_extensions import Final, ParamSpec, TypeAlias
from PIL import Image
@@ -56,7 +56,7 @@ def locate(
limit: Unused = 1,
region: tuple[int, int, int, int] | None = None,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Box | None: ...
# _locateAll_pillow
@@ -82,7 +82,7 @@ def locateOnScreen(
limit: Unused = 1,
region: tuple[int, int, int, int] | None = None,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Box | None: ...
# _locateAll_pillow
@@ -107,7 +107,7 @@ def locateAllOnScreen(
limit: int = 1000,
region: tuple[int, int, int, int] | None = None,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Generator[Box, None, None]: ...
# _locateAll_pillow
@@ -132,7 +132,7 @@ def locateCenterOnScreen(
limit: Unused = 1,
region: tuple[int, int, int, int] | None = None,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Point | None: ...
# _locateAll_pillow
@@ -159,7 +159,7 @@ def locateOnWindow(
grayscale: bool | None = None,
limit: Unused = 1,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Box | None: ...
# _locateAll_pillow
@@ -201,7 +201,7 @@ def locateAll(
limit: int = 1000,
region: tuple[int, int, int, int] | None = None,
step: int = 1,
confidence: SupportsFloat | SupportsIndex | str | ReadableBuffer = 0.999,
confidence: ConvertibleToFloat = 0.999,
) -> Generator[Box, None, None]: ...
# _locateAll_pillow

View File

@@ -1,8 +1,8 @@
import enum
from _typeshed import ReadableBuffer, SupportsKeysAndGetItem
from _typeshed import ConvertibleToFloat, SupportsKeysAndGetItem
from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence, Set as AbstractSet
from typing import Any, Generic, NamedTuple, SupportsFloat, TypeVar, overload, type_check_only
from typing_extensions import Literal, ParamSpec, Self, SupportsIndex, TypeAlias
from typing import Any, Generic, NamedTuple, TypeVar, overload, type_check_only
from typing_extensions import Literal, ParamSpec, Self, TypeAlias
_T = TypeVar("_T")
_KT = TypeVar("_KT")
@@ -10,7 +10,6 @@ _VT_co = TypeVar("_VT_co", covariant=True)
_P = ParamSpec("_P")
_Mode: TypeAlias = Literal["string", "filename", "dirname"]
_OutputStyle: TypeAlias = Literal["nested", "expanded", "compact", "compressed"]
_ConvertsToFloat: TypeAlias = SupportsFloat | SupportsIndex | str | ReadableBuffer
_CustomFunctions: TypeAlias = Mapping[str, Callable[..., Any]] | Sequence[Callable[..., Any]] | AbstractSet[Callable[..., Any]]
_ImportCallbackRet: TypeAlias = (
list[tuple[str, str, str]] | list[tuple[str, str]] | list[tuple[str]] | list[tuple[str, ...]] | None
@@ -113,7 +112,7 @@ class _SassNumber(NamedTuple):
unit: str
class SassNumber(_SassNumber):
def __new__(cls, value: _ConvertsToFloat, unit: str | bytes) -> Self: ...
def __new__(cls, value: ConvertibleToFloat, unit: str | bytes) -> Self: ...
@type_check_only
class _SassColor(NamedTuple):
@@ -123,7 +122,7 @@ class _SassColor(NamedTuple):
a: float
class SassColor(_SassColor):
def __new__(cls, r: _ConvertsToFloat, g: _ConvertsToFloat, b: _ConvertsToFloat, a: _ConvertsToFloat) -> Self: ...
def __new__(cls, r: ConvertibleToFloat, g: ConvertibleToFloat, b: ConvertibleToFloat, a: ConvertibleToFloat) -> Self: ...
@type_check_only
class _Separator(enum.Enum):

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Alias, Integer, NoneSet, Typed, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Integer, NoneSet, Typed, _ConvertibleToBool
from openpyxl.descriptors.nested import NestedString, NestedText, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.colors import Color
@@ -20,7 +20,7 @@ class PhoneticProperties(Serialisable):
alignment: NoneSet[_PhoneticPropertiesAlignment]
def __init__(
self,
fontId: _ConvertibleToInt,
fontId: ConvertibleToInt,
type: _PhoneticPropertiesType | Literal["none"] | None = None,
alignment: _PhoneticPropertiesAlignment | Literal["none"] | None = None,
) -> None: ...
@@ -33,7 +33,7 @@ class PhoneticText(Serialisable):
eb: Integer[Literal[False]]
t: NestedText[str, Literal[False]]
text: Alias
def __init__(self, sb: _ConvertibleToInt, eb: _ConvertibleToInt, t: object = None) -> None: ...
def __init__(self, sb: ConvertibleToInt, eb: ConvertibleToInt, t: object = None) -> None: ...
class InlineFont(Font):
tagname: ClassVar[str]
@@ -57,8 +57,8 @@ class InlineFont(Font):
def __init__(
self,
rFont: object = None,
charset: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
family: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
charset: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
family: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
b: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
i: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
strike: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
@@ -67,7 +67,7 @@ class InlineFont(Font):
condense: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
extend: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
color: Color | None = None,
sz: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
sz: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
u: _NestedNoneSetParam[_FontU] = None,
vertAlign: _NestedNoneSetParam[_FontVertAlign] = None,
scheme: _NestedNoneSetParam[_FontScheme] = None,

View File

@@ -1,10 +1,10 @@
from _typeshed import Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.chart.picture import PictureOptions
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger, NestedMinMax
from openpyxl.descriptors.serialisable import Serialisable
@@ -27,12 +27,12 @@ class View3D(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
rotX: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = 15,
hPercent: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
rotY: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = 20,
depthPercent: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
rotX: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = 15,
hPercent: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
rotY: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = 20,
depthPercent: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
rAngAx: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = True,
perspective: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
perspective: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
extLst: Unused = None,
) -> None: ...
@@ -46,7 +46,7 @@ class Surface(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
thickness: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
thickness: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
spPr: GraphicalProperties | None = None,
pictureOptions: PictureOptions | None = None,
extLst: Unused = None,

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
@@ -6,14 +6,14 @@ from openpyxl.chart.layout import Layout
from openpyxl.chart.legend import Legend
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.title import TitleDescriptor
from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, Set, Typed, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, Set, Typed
from openpyxl.descriptors.serialisable import Serialisable
_ChartBaseDisplayBlanks: TypeAlias = Literal["span", "gap", "zero"]
class AxId(Serialisable):
val: Integer[Literal[False]]
def __init__(self, val: _ConvertibleToInt) -> None: ...
def __init__(self, val: ConvertibleToInt) -> None: ...
def PlotArea(): ...

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, Self, TypeAlias
@@ -6,7 +6,7 @@ from openpyxl.chart.layout import Layout
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText, Text
from openpyxl.chart.title import Title, TitleDescriptor
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import (
NestedBool,
@@ -57,10 +57,10 @@ class Scaling(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
logBase: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
logBase: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
orientation: _HasTagAndGet[_ScalingOrientation] | _ScalingOrientation = "minMax",
max: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
min: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
max: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
min: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
extLst: Unused = None,
) -> None: ...
@@ -88,7 +88,7 @@ class _BaseAxis(Serialisable):
@overload
def __init__(
self,
axId: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
axId: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
scaling: Scaling | None,
delete: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
axPos: _HasTagAndGet[_BaseAxisAxPos] | _BaseAxisAxPos,
@@ -101,14 +101,14 @@ class _BaseAxis(Serialisable):
tickLblPos: _NestedNoneSetParam[_BaseAxisTickLblPos],
spPr: GraphicalProperties | None,
txPr: RichText | None,
crossAx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
crossAx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
crosses: _NestedNoneSetParam[_BaseAxisCrosses] = None,
crossesAt: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
crossesAt: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
) -> None: ...
@overload
def __init__(
self,
axId: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
axId: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
scaling: Scaling | None = None,
delete: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
axPos: _HasTagAndGet[_BaseAxisAxPos] | _BaseAxisAxPos = "l",
@@ -122,9 +122,9 @@ class _BaseAxis(Serialisable):
spPr: GraphicalProperties | None = None,
txPr: RichText | None = None,
*,
crossAx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
crossAx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
crosses: Incomplete | None = None,
crossesAt: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
crossesAt: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
) -> None: ...
class DisplayUnitsLabel(Serialisable):
@@ -154,7 +154,7 @@ class DisplayUnitsLabelList(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
custUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
custUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
builtInUnit: _HasTagAndGet[_DisplayUnitsLabelListBuiltInUnit]
| _DisplayUnitsLabelListBuiltInUnit
| Literal["none"]
@@ -191,8 +191,8 @@ class NumericAxis(_BaseAxis):
def __init__(
self,
crossBetween: _NestedNoneSetParam[_NumericAxisCrossBetween] = None,
majorUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
minorUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
majorUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
minorUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
dispUnits: DisplayUnitsLabelList | None = None,
extLst: Unused = None,
**kw,
@@ -231,9 +231,9 @@ class TextAxis(_BaseAxis):
self,
auto: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
lblAlgn: _NestedNoneSetParam[_TextAxisLblAlgn] = None,
lblOffset: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat = 100,
tickLblSkip: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
tickMarkSkip: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lblOffset: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat = 100,
tickLblSkip: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
tickMarkSkip: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
noMultiLvlLbl: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
extLst: Unused = None,
**kw,
@@ -270,11 +270,11 @@ class DateAxis(TextAxis):
def __init__(
self,
auto: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
lblOffset: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lblOffset: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
baseTimeUnit: _NestedNoneSetParam[_DateAxisTimeUnit] = None,
majorUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
majorUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
majorTimeUnit: _NestedNoneSetParam[_DateAxisTimeUnit] = None,
minorUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
minorUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
minorTimeUnit: _NestedNoneSetParam[_DateAxisTimeUnit] = None,
extLst: Unused = None,
**kw,
@@ -305,8 +305,8 @@ class SeriesAxis(_BaseAxis):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
tickLblSkip: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
tickMarkSkip: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
tickLblSkip: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
tickMarkSkip: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
extLst: Unused = None,
**kw,
) -> None: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.axis import NumericAxis
from openpyxl.chart.label import DataLabelList
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedMinMax, NestedNoneSet, _NestedNoneSetParam
@@ -33,7 +33,7 @@ class BubbleChart(ChartBase):
ser=(),
dLbls: DataLabelList | None = None,
bubble3D: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
bubbleScale: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
bubbleScale: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
showNegBubbles: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
sizeRepresents: _NestedNoneSetParam[_BubbleChartSizeRepresents] = None,
extLst: Unused = None,

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
@@ -10,7 +10,7 @@ from openpyxl.chart.print_settings import PrintSettings
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText
from openpyxl.chart.title import Title
from openpyxl.descriptors.base import Alias, String, Typed, _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedMinMax, NestedNoneSet, NestedString, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -109,7 +109,7 @@ class ChartSpace(Serialisable):
date1904: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
lang: object = None,
roundedCorners: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
style: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
style: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
clrMapOvr: ColorMapping | None = None,
pivotSource: PivotSource | None = None,
protection: Protection | None = None,
@@ -128,7 +128,7 @@ class ChartSpace(Serialisable):
date1904: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
lang: object,
roundedCorners: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
style: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None,
style: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None,
clrMapOvr: ColorMapping | None,
pivotSource: PivotSource | None,
protection: Protection | None,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, NoReturn, overload
from typing_extensions import Literal
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import Alias, Bool, Integer, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedInteger, NestedText
from openpyxl.descriptors.serialisable import Serialisable
@@ -24,7 +24,7 @@ class NumVal(Serialisable):
idx: Integer[Literal[False]]
formatCode: NestedText[str, Literal[True]]
v: Incomplete
def __init__(self, idx: _ConvertibleToInt, formatCode: object = None, v: Incomplete | None = None) -> None: ...
def __init__(self, idx: ConvertibleToInt, formatCode: object = None, v: Incomplete | None = None) -> None: ...
class NumData(Serialisable):
formatCode: NestedText[str, Literal[True]]
@@ -35,7 +35,7 @@ class NumData(Serialisable):
def __init__(
self,
formatCode: object = None,
ptCount: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
ptCount: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
pt=(),
extLst: Unused = None,
) -> None: ...
@@ -52,7 +52,7 @@ class StrVal(Serialisable):
tagname: ClassVar[str]
idx: Integer[Literal[False]]
v: NestedText[str, Literal[False]]
def __init__(self, idx: _ConvertibleToInt = 0, v: object = None) -> None: ...
def __init__(self, idx: ConvertibleToInt = 0, v: object = None) -> None: ...
class StrData(Serialisable):
tagname: ClassVar[str]
@@ -61,7 +61,7 @@ class StrData(Serialisable):
extLst: Typed[ExtensionList, Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self, ptCount: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None, pt=(), extLst: Unused = None
self, ptCount: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None, pt=(), extLst: Unused = None
) -> None: ...
class StrRef(Serialisable):
@@ -89,7 +89,7 @@ class MultiLevelStrData(Serialisable):
lvl: Incomplete
extLst: Typed[ExtensionList, Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, ptCount: _ConvertibleToInt | None = None, lvl=(), extLst: Unused = None) -> None: ...
def __init__(self, ptCount: ConvertibleToInt | None = None, lvl=(), extLst: Unused = None) -> None: ...
class MultiLevelStrRef(Serialisable):
tagname: ClassVar[str]

View File

@@ -1,10 +1,10 @@
from _typeshed import Unused
from _typeshed import ConvertibleToFloat, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.data_source import NumDataSource
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedNoneSet, NestedSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -39,7 +39,7 @@ class ErrorBars(Serialisable):
noEndCap: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
plus: NumDataSource | None = None,
minus: NumDataSource | None = None,
val: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
val: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
spPr: GraphicalProperties | None = None,
extLst: Unused = None,
) -> None: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger, NestedNoneSet, NestedString, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -66,7 +66,7 @@ class DataLabel(_DataLabelBase):
# separator = _DataLabelBase.separator
# extLst = _DataLabelBase.extLst
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0, **kw) -> None: ...
def __init__(self, idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0, **kw) -> None: ...
class DataLabelList(_DataLabelBase):
tagname: ClassVar[str]

View File

@@ -1,8 +1,8 @@
from _typeshed import Unused
from _typeshed import ConvertibleToFloat, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Typed
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedMinMax, NestedNoneSet, NestedSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -34,10 +34,10 @@ class ManualLayout(Serialisable):
yMode: _NestedNoneSetParam[_ManualLayoutMode] = None,
wMode: _HasTagAndGet[_ManualLayoutMode] | _ManualLayoutMode = "factor",
hMode: _HasTagAndGet[_ManualLayoutMode] | _ManualLayoutMode = "factor",
x: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
y: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
w: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
h: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
x: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
y: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
w: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
h: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
extLst: Unused = None,
) -> None: ...

View File

@@ -1,11 +1,11 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.layout import Layout
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger, NestedSet
from openpyxl.descriptors.serialisable import Serialisable
@@ -23,7 +23,7 @@ class LegendEntry(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0,
idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0,
delete: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = False,
txPr: RichText | None = None,
extLst: Unused = None,

View File

@@ -1,10 +1,10 @@
from _typeshed import Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.picture import PictureOptions
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger, NestedMinMax, NestedNoneSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -26,7 +26,7 @@ class Marker(Serialisable):
def __init__(
self,
symbol: _NestedNoneSetParam[_MarkerSymbol] = None,
size: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
size: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
spPr: GraphicalProperties | None = None,
extLst: Unused = None,
) -> None: ...
@@ -45,11 +45,11 @@ class DataPoint(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
invertIfNegative: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
marker: Marker | None = None,
bubble3D: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
explosion: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
explosion: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
spPr: GraphicalProperties | None = None,
pictureOptions: PictureOptions | None = None,
extLst: Unused = None,

View File

@@ -1,7 +1,8 @@
from _typeshed import ConvertibleToFloat
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import _ConvertibleToBool
from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedNoneSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -23,5 +24,5 @@ class PictureOptions(Serialisable):
applyToSides: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
applyToEnd: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
pictureFormat: _NestedNoneSetParam[_PictureOptionsPictureFormat] = None,
pictureStackUnit: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
pictureStackUnit: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
) -> None: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.chart.axis import ChartLines
from openpyxl.chart.label import DataLabelList
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedMinMax, NestedNoneSet, NestedSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -38,7 +38,7 @@ class PieChart(_PieChartBase):
extLst: Typed[ExtensionList, Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self, firstSliceAng: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat = 0, extLst: Unused = None, **kw
self, firstSliceAng: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat = 0, extLst: Unused = None, **kw
) -> None: ...
class PieChart3D(_PieChartBase):
@@ -62,8 +62,8 @@ class DoughnutChart(_PieChartBase):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
firstSliceAng: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat = 0,
holeSize: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = 10,
firstSliceAng: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat = 0,
holeSize: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = 10,
extLst: Unused = None,
**kw,
) -> None: ...
@@ -96,9 +96,9 @@ class ProjectedPieChart(_PieChartBase):
ofPieType: _HasTagAndGet[_ProjectedPieChartOfPieType] | _ProjectedPieChartOfPieType = "pie",
gapWidth: Incomplete | None = None,
splitType: _NestedNoneSetParam[_ProjectedPieChartSplitType] = "auto",
splitPos: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
splitPos: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
custSplit: CustomSplit | None = None,
secondPieSize: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = 75,
secondPieSize: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = 75,
serLines: ChartLines | None = None,
extLst: Unused = None,
**kw,

View File

@@ -1,4 +1,4 @@
from _typeshed import Unused
from _typeshed import ConvertibleToInt, Unused
from typing import ClassVar, overload
from typing_extensions import Literal
@@ -6,7 +6,7 @@ from openpyxl.chart.label import DataLabel as _DataLabel
from openpyxl.chart.marker import Marker
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedInteger, NestedText
from openpyxl.descriptors.serialisable import Serialisable
@@ -21,11 +21,11 @@ class PivotSource(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
@overload
def __init__(
self, name: object, fmtId: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt, extLst: Unused = None
self, name: object, fmtId: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt, extLst: Unused = None
) -> None: ...
@overload
def __init__(
self, name: object = None, *, fmtId: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt, extLst: Unused = None
self, name: object = None, *, fmtId: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt, extLst: Unused = None
) -> None: ...
class PivotFormat(Serialisable):
@@ -42,7 +42,7 @@ class PivotFormat(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0,
idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0,
spPr: GraphicalProperties | None = None,
txPr: RichText | None = None,
marker: Marker | None = None,

View File

@@ -1,7 +1,8 @@
from _typeshed import ConvertibleToFloat
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Alias, Float, Typed, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Float, Typed
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.header_footer import HeaderFooter
from openpyxl.worksheet.page import PrintPageSetup
@@ -20,12 +21,12 @@ class PageMargins(Serialisable):
footer: Float[Literal[False]]
def __init__(
self,
l: _ConvertibleToFloat = 0.75,
r: _ConvertibleToFloat = 0.75,
t: _ConvertibleToFloat = 1,
b: _ConvertibleToFloat = 1,
header: _ConvertibleToFloat = 0.5,
footer: _ConvertibleToFloat = 0.5,
l: ConvertibleToFloat = 0.75,
r: ConvertibleToFloat = 0.75,
t: ConvertibleToFloat = 1,
b: ConvertibleToFloat = 1,
header: ConvertibleToFloat = 0.5,
footer: ConvertibleToFloat = 0.5,
) -> None: ...
class PrintSettings(Serialisable):

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from collections.abc import Generator
from typing import overload
from typing_extensions import Literal
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import MinMax, String, _ConvertibleToInt
from openpyxl.descriptors.base import MinMax, String
class DummyWorksheet:
title: str
@@ -32,10 +32,10 @@ class Reference(Strict):
def __init__(
self,
worksheet: Incomplete | None,
min_col: _ConvertibleToInt,
min_row: _ConvertibleToInt,
max_col: _ConvertibleToInt | None = None,
max_row: _ConvertibleToInt | None = None,
min_col: ConvertibleToInt,
min_row: ConvertibleToInt,
max_col: ConvertibleToInt | None = None,
max_row: ConvertibleToInt | None = None,
range_string: str | None = None,
) -> None: ...
def __len__(self) -> int: ...

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
@@ -9,7 +9,7 @@ from openpyxl.chart.marker import Marker
from openpyxl.chart.picture import PictureOptions
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.trendline import Trendline
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger, NestedNoneSet, NestedText, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -60,8 +60,8 @@ class Series(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0,
order: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0,
idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0,
order: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0,
tx: SeriesLabel | None = None,
spPr: GraphicalProperties | None = None,
pictureOptions: PictureOptions | None = None,
@@ -79,7 +79,7 @@ class Series(Serialisable):
bubble3D: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
marker: Marker | None = None,
smooth: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
explosion: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
explosion: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
extLst: Unused = None,
) -> None: ...
def to_tree(self, tagname: str | None = None, idx: Incomplete | None = None): ... # type: ignore[override]

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.chart.axis import NumericAxis, SeriesAxis, TextAxis
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedInteger
from openpyxl.descriptors.serialisable import Serialisable
@@ -20,7 +20,7 @@ class BandFormat(Serialisable):
graphicalProperties: Alias
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self, idx: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt = 0, spPr: GraphicalProperties | None = None
self, idx: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt = 0, spPr: GraphicalProperties | None = None
) -> None: ...
class BandFormatList(Serialisable):

View File

@@ -1,4 +1,4 @@
from _typeshed import Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
@@ -6,7 +6,7 @@ from openpyxl.chart.data_source import NumFmt
from openpyxl.chart.layout import Layout
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText, Text
from openpyxl.descriptors.base import Alias, String, Typed, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedInteger, NestedSet
from openpyxl.descriptors.serialisable import Serialisable
@@ -57,11 +57,11 @@ class Trendline(Serialisable):
name: str | None = None,
spPr: ExtensionList | None = None,
trendlineType: _HasTagAndGet[_TrendlineTrendlineType] | _TrendlineTrendlineType = "linear",
order: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
period: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
forward: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
backward: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
intercept: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
order: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
period: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
forward: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
backward: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
intercept: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
dispRSqr: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
dispEq: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
trendlineLbl: ExtensionList | None = None,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl import _VisibilityType
from openpyxl.descriptors.base import Bool, Integer, Set, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Set, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.header_footer import HeaderFooter
from openpyxl.worksheet.page import PageMargins, PrintPageSetup
@@ -23,7 +23,7 @@ class CustomChartsheetView(Serialisable):
self,
guid: Incomplete | None = None,
*,
scale: _ConvertibleToInt,
scale: ConvertibleToInt,
state: _VisibilityType = "visible",
zoomToFit: _ConvertibleToBool | None = None,
pageMargins: PageMargins | None = None,
@@ -34,7 +34,7 @@ class CustomChartsheetView(Serialisable):
def __init__(
self,
guid: Incomplete | None,
scale: _ConvertibleToInt,
scale: ConvertibleToInt,
state: _VisibilityType = "visible",
zoomToFit: _ConvertibleToBool | None = None,
pageMargins: PageMargins | None = None,

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.protection import _Protected
@@ -21,7 +21,7 @@ class ChartsheetProtection(Serialisable, _Protected):
content: _ConvertibleToBool | None = None,
objects: _ConvertibleToBool | None = None,
hashValue: Incomplete | None = None,
spinCount: _ConvertibleToInt | None = None,
spinCount: ConvertibleToInt | None = None,
saltValue: Incomplete | None = None,
algorithmName: str | None = None,
password: Incomplete | None = None,

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_WebPublishItemSourceType: TypeAlias = Literal[
@@ -22,7 +22,7 @@ class WebPublishItem(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
divId: str,
sourceType: _WebPublishItemSourceType,
sourceRef: str,
@@ -35,7 +35,7 @@ class WebPublishItem(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
divId: str,
sourceType: _WebPublishItemSourceType,
sourceRef: str,
@@ -50,4 +50,4 @@ class WebPublishItems(Serialisable):
count: Integer[Literal[True]]
webPublishItem: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt | None = None, webPublishItem: Incomplete | None = None) -> None: ...
def __init__(self, count: ConvertibleToInt | None = None, webPublishItem: Incomplete | None = None) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Alias, Integer, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Integer
from openpyxl.descriptors.serialisable import Serialisable
class SheetBackgroundPicture(Serialisable):
@@ -51,22 +51,22 @@ class DrawingHF(Serialisable):
def __init__(
self,
id: Incomplete | None = None,
lho: _ConvertibleToInt | None = None,
lhe: _ConvertibleToInt | None = None,
lhf: _ConvertibleToInt | None = None,
cho: _ConvertibleToInt | None = None,
che: _ConvertibleToInt | None = None,
chf: _ConvertibleToInt | None = None,
rho: _ConvertibleToInt | None = None,
rhe: _ConvertibleToInt | None = None,
rhf: _ConvertibleToInt | None = None,
lfo: _ConvertibleToInt | None = None,
lfe: _ConvertibleToInt | None = None,
lff: _ConvertibleToInt | None = None,
cfo: _ConvertibleToInt | None = None,
cfe: _ConvertibleToInt | None = None,
cff: _ConvertibleToInt | None = None,
rfo: _ConvertibleToInt | None = None,
rfe: _ConvertibleToInt | None = None,
rff: _ConvertibleToInt | None = None,
lho: ConvertibleToInt | None = None,
lhe: ConvertibleToInt | None = None,
lhf: ConvertibleToInt | None = None,
cho: ConvertibleToInt | None = None,
che: ConvertibleToInt | None = None,
chf: ConvertibleToInt | None = None,
rho: ConvertibleToInt | None = None,
rhe: ConvertibleToInt | None = None,
rhf: ConvertibleToInt | None = None,
lfo: ConvertibleToInt | None = None,
lfe: ConvertibleToInt | None = None,
lff: ConvertibleToInt | None = None,
cfo: ConvertibleToInt | None = None,
cfe: ConvertibleToInt | None = None,
cff: ConvertibleToInt | None = None,
rfo: ConvertibleToInt | None = None,
rfe: ConvertibleToInt | None = None,
rff: ConvertibleToInt | None = None,
) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
@@ -17,8 +17,8 @@ class ChartsheetView(Serialisable):
def __init__(
self,
tabSelected: _ConvertibleToBool | None = None,
zoomScale: _ConvertibleToInt | None = None,
workbookViewId: _ConvertibleToInt = 0,
zoomScale: ConvertibleToInt | None = None,
workbookViewId: ConvertibleToInt = 0,
zoomToFit: _ConvertibleToBool | None = True,
extLst: Unused = None,
) -> None: ...

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from collections.abc import Generator
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
@@ -6,7 +6,7 @@ from typing_extensions import Literal, TypeAlias
from openpyxl.cell.text import Text
from openpyxl.comments.author import AuthorList
from openpyxl.comments.comments import Comment
from openpyxl.descriptors.base import Bool, Integer, Set, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.ole import ObjectAnchor
@@ -90,9 +90,9 @@ class CommentRecord(Serialisable):
def __init__(
self,
ref: str = "",
authorId: _ConvertibleToInt = 0,
authorId: ConvertibleToInt = 0,
guid: Incomplete | None = None,
shapeId: _ConvertibleToInt | None = 0,
shapeId: ConvertibleToInt | None = 0,
text: Text | None = None,
commentPr: Properties | None = None,
author: str | None = None,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, ReadableBuffer, SupportsTrunc, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, ReadableBuffer, Unused
from collections.abc import Iterable, Sized
from datetime import datetime
from re import Pattern
from typing import Any, Generic, SupportsFloat, SupportsInt, TypeVar, overload
from typing_extensions import Literal, SupportsIndex, TypeAlias
from typing import Any, Generic, TypeVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors import Strict
from openpyxl.descriptors.serialisable import Serialisable
@@ -18,9 +18,7 @@ _M = TypeVar("_M", int, float)
_ExpectedTypeParam: TypeAlias = type[_T] | tuple[type[_T], ...]
_ConvertibleToMultiCellRange: TypeAlias = MultiCellRange | str | Iterable[CellRange]
_ConvertibleToInt: TypeAlias = int | str | ReadableBuffer | SupportsInt | SupportsIndex | SupportsTrunc
_ConvertibleToFloat: TypeAlias = float | SupportsFloat | SupportsIndex | str | ReadableBuffer
# Since everything is convertible to a bool, this restricts to only intended expected types
# Since everything is convertible to a bool, this restricts to only intended expected types of intended literals
_ConvertibleToBool: TypeAlias = bool | str | int | None # True | False | "true" | "t" | "false" | "f" | 1 | 0 | None
class Descriptor(Generic[_T]):
@@ -106,19 +104,17 @@ class Convertible(Typed[_T, _N]):
# int
@overload
def __set__(
self: Convertible[int, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToInt | None
self: Convertible[int, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToInt | None
) -> None: ...
@overload
def __set__(self: Convertible[int, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToInt) -> None: ...
def __set__(self: Convertible[int, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToInt) -> None: ...
# float
@overload
def __set__(
self: Convertible[float, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToFloat | None
self: Convertible[float, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToFloat | None
) -> None: ...
@overload
def __set__(
self: Convertible[float, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToFloat
) -> None: ...
def __set__(self: Convertible[float, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToFloat) -> None: ...
# Anything else
@overload
def __set__(self: Convertible[_T, Literal[True]], instance: Serialisable | Strict, value: _T | int | Any | None) -> None: ...
@@ -149,13 +145,13 @@ class Max(Convertible[_M, _N]):
max: float,
) -> None: ...
@overload # type:ignore[override] # Different restrictions
def __set__(self: Max[int, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToInt | None) -> None: ...
def __set__(self: Max[int, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToInt | None) -> None: ...
@overload
def __set__(self: Max[int, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToInt) -> None: ...
def __set__(self: Max[int, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToInt) -> None: ...
@overload
def __set__(self: Max[float, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToFloat | None) -> None: ...
def __set__(self: Max[float, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToFloat | None) -> None: ...
@overload
def __set__(self: Max[float, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToFloat) -> None: ...
def __set__(self: Max[float, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToFloat) -> None: ...
class Min(Convertible[_M, _N]):
expected_type: type[_M]
@@ -183,13 +179,13 @@ class Min(Convertible[_M, _N]):
min: float,
) -> None: ...
@overload # type:ignore[override] # Different restrictions
def __set__(self: Min[int, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToInt | None) -> None: ...
def __set__(self: Min[int, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToInt | None) -> None: ...
@overload
def __set__(self: Min[int, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToInt) -> None: ...
def __set__(self: Min[int, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToInt) -> None: ...
@overload
def __set__(self: Min[float, Literal[True]], instance: Serialisable | Strict, value: _ConvertibleToFloat | None) -> None: ...
def __set__(self: Min[float, Literal[True]], instance: Serialisable | Strict, value: ConvertibleToFloat | None) -> None: ...
@overload
def __set__(self: Min[float, Literal[False]], instance: Serialisable | Strict, value: _ConvertibleToFloat) -> None: ...
def __set__(self: Min[float, Literal[False]], instance: Serialisable | Strict, value: ConvertibleToFloat) -> None: ...
class MinMax(Min[_M, _N], Max[_M, _N]):
expected_type: type[_M]

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from collections.abc import Iterable
from typing import Any, ClassVar, NoReturn, overload
from typing_extensions import Literal, TypeAlias
@@ -10,7 +10,7 @@ from openpyxl.drawing.fill import Blip
from openpyxl.xml.functions import Element
from ..xml._functions_overloads import _HasGet, _HasTagAndGet, _HasText
from .base import _M, _N, _T, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt, _ExpectedTypeParam
from .base import _M, _N, _T, _ConvertibleToBool, _ExpectedTypeParam
_NestedNoneSetParam: TypeAlias = _HasTagAndGet[_T | Literal["none"] | None] | _T | Literal["none"] | None
@@ -80,26 +80,26 @@ class NestedValue(Nested[_T], Convertible[_T, _N]): # type: ignore[misc]
def __set__(
self: NestedValue[int, Literal[True]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
value: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
) -> None: ...
@overload
def __set__(
self: NestedValue[int, Literal[False]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
value: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
) -> None: ...
# float
@overload
def __set__(
self: NestedValue[float, Literal[True]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None,
value: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None,
) -> None: ...
@overload
def __set__(
self: NestedValue[float, Literal[False]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat,
value: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat,
) -> None: ...
# Anything else
@overload
@@ -140,10 +140,10 @@ class NestedText(NestedValue[_T, _N]):
# int
@overload
def __set__(
self: NestedText[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: NestedText[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: NestedText[_T, Literal[True]], instance: Serialisable | Strict, value: _HasTagAndGet[Any]) -> NoReturn: ...
@@ -232,25 +232,25 @@ class NestedMinMax(Nested[_M], MinMax[_M, _N]): # type: ignore[misc]
def __set__(
self: NestedMinMax[int, Literal[True]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
value: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
) -> None: ...
@overload
def __set__(
self: NestedMinMax[int, Literal[False]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToInt] | _ConvertibleToInt,
value: _HasTagAndGet[ConvertibleToInt] | ConvertibleToInt,
) -> None: ...
@overload
def __set__(
self: NestedMinMax[float, Literal[True]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None,
value: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None,
) -> None: ...
@overload
def __set__(
self: NestedMinMax[float, Literal[False]],
instance: Serialisable | Strict,
value: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat,
value: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat,
) -> None: ...
class EmptyTag(Nested[bool], Bool[_N]): # type: ignore[misc]

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Final, Literal, TypeAlias
from openpyxl.descriptors import Strict, Typed
from openpyxl.descriptors.base import Alias, Integer, MinMax, Set, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Integer, MinMax, Set, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import EmptyTag, NestedInteger, NestedNoneSet, NestedValue, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -300,32 +300,32 @@ class SystemColor(Serialisable):
self,
val: _SystemColorVal = "windowText",
lastClr: Incomplete | None = None,
tint: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
shade: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
tint: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
shade: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
comp: Transform | None = None,
inv: Transform | None = None,
gray: Transform | None = None,
alpha: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alphaOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alphaMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
sat: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
satOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
satMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lum: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lumOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lumMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
red: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
redOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
redMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
green: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
greenOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
greenMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alpha: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
alphaOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
alphaMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
sat: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
satOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
satMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lum: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lumOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lumMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
red: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
redOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
redMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
green: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
greenOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
greenMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
gamma: Transform | None = None,
invGamma: Transform | None = None,
) -> None: ...
@@ -335,14 +335,14 @@ class HSLColor(Serialisable):
hue: Integer[Literal[False]]
sat: MinMax[float, Literal[False]]
lum: MinMax[float, Literal[False]]
def __init__(self, hue: _ConvertibleToInt, sat: _ConvertibleToFloat, lum: _ConvertibleToFloat) -> None: ...
def __init__(self, hue: ConvertibleToInt, sat: ConvertibleToFloat, lum: ConvertibleToFloat) -> None: ...
class RGBPercent(Serialisable):
tagname: ClassVar[str]
r: MinMax[float, Literal[False]]
g: MinMax[float, Literal[False]]
b: MinMax[float, Literal[False]]
def __init__(self, r: _ConvertibleToFloat, g: _ConvertibleToFloat, b: _ConvertibleToFloat) -> None: ...
def __init__(self, r: ConvertibleToFloat, g: ConvertibleToFloat, b: ConvertibleToFloat) -> None: ...
_RGBPercent: TypeAlias = RGBPercent
@@ -382,32 +382,32 @@ class SchemeColor(Serialisable):
@overload
def __init__(
self,
tint: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
shade: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
tint: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
shade: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
comp: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
inv: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
gray: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alpha: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alphaOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
alphaMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
hueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
sat: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
satOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
satMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lum: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lumOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
lumMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
red: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
redOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
redMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
green: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
greenOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
greenMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
blueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
inv: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
gray: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
alpha: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
alphaOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
alphaMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
hueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
sat: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
satOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
satMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lum: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lumOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
lumMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
red: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
redOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
redMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
green: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
greenOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
greenMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
blueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
gamma: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
invGamma: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
*,
@@ -416,32 +416,32 @@ class SchemeColor(Serialisable):
@overload
def __init__(
self,
tint: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
shade: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
tint: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
shade: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
comp: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
inv: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
gray: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
alpha: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
alphaOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
alphaMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
hue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
hueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
hueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
sat: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
satOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
satMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
lum: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
lumOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
lumMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
red: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
redOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
redMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
green: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
greenOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
greenMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
blue: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
blueOff: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
blueMod: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None,
inv: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
gray: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
alpha: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
alphaOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
alphaMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
hue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
hueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
hueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
sat: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
satOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
satMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
lum: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
lumOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
lumMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
red: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
redOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
redMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
green: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
greenOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
greenMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
blue: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
blueOff: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
blueMod: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None,
gamma: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
invGamma: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None,
val: _SchemeColors,

View File

@@ -1,10 +1,11 @@
from _typeshed import ConvertibleToInt
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.chart.shapes import GraphicalProperties
from openpyxl.chart.text import RichText
from openpyxl.descriptors import Typed
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.drawing.geometry import ShapeStyle
@@ -13,7 +14,7 @@ from openpyxl.drawing.properties import NonVisualDrawingProps, NonVisualDrawingS
class Connection(Serialisable):
id: Integer[Literal[False]]
idx: Integer[Literal[False]]
def __init__(self, id: _ConvertibleToInt, idx: _ConvertibleToInt) -> None: ...
def __init__(self, id: ConvertibleToInt, idx: ConvertibleToInt) -> None: ...
class ConnectorLocking(Serialisable):
extLst: Typed[ExtensionList, Literal[True]]

View File

@@ -1,17 +1,8 @@
from _typeshed import ConvertibleToFloat, ConvertibleToInt
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Bool,
Float,
Integer,
Set,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, Float, Integer, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from .colors import ColorChoice
@@ -46,19 +37,19 @@ class TintEffect(Serialisable):
tagname: ClassVar[str]
hue: Integer[Literal[False]]
amt: Integer[Literal[False]]
def __init__(self, hue: _ConvertibleToInt = 0, amt: _ConvertibleToInt = 0) -> None: ...
def __init__(self, hue: ConvertibleToInt = 0, amt: ConvertibleToInt = 0) -> None: ...
class LuminanceEffect(Serialisable):
tagname: ClassVar[str]
bright: Integer[Literal[False]]
contrast: Integer[Literal[False]]
def __init__(self, bright: _ConvertibleToInt = 0, contrast: _ConvertibleToInt = 0) -> None: ...
def __init__(self, bright: ConvertibleToInt = 0, contrast: ConvertibleToInt = 0) -> None: ...
class HSLEffect(Serialisable):
hue: Integer[Literal[False]]
sat: Integer[Literal[False]]
lum: Integer[Literal[False]]
def __init__(self, hue: _ConvertibleToInt, sat: _ConvertibleToInt, lum: _ConvertibleToInt) -> None: ...
def __init__(self, hue: ConvertibleToInt, sat: ConvertibleToInt, lum: ConvertibleToInt) -> None: ...
class GrayscaleEffect(Serialisable):
tagname: ClassVar[str]
@@ -83,19 +74,19 @@ class ColorChangeEffect(Serialisable):
class BlurEffect(Serialisable):
rad: Float[Literal[False]]
grow: Bool[Literal[True]]
def __init__(self, rad: _ConvertibleToFloat, grow: _ConvertibleToBool | None = None) -> None: ...
def __init__(self, rad: ConvertibleToFloat, grow: _ConvertibleToBool | None = None) -> None: ...
class BiLevelEffect(Serialisable):
thresh: Integer[Literal[False]]
def __init__(self, thresh: _ConvertibleToInt) -> None: ...
def __init__(self, thresh: ConvertibleToInt) -> None: ...
class AlphaReplaceEffect(Serialisable):
a: Integer[Literal[False]]
def __init__(self, a: _ConvertibleToInt) -> None: ...
def __init__(self, a: ConvertibleToInt) -> None: ...
class AlphaModulateFixedEffect(Serialisable):
amt: Integer[Literal[False]]
def __init__(self, amt: _ConvertibleToInt) -> None: ...
def __init__(self, amt: ConvertibleToInt) -> None: ...
class EffectContainer(Serialisable):
type: Set[_EffectContainerType]
@@ -112,7 +103,7 @@ class AlphaCeilingEffect(Serialisable): ...
class AlphaBiLevelEffect(Serialisable):
thresh: Integer[Literal[False]]
def __init__(self, thresh: _ConvertibleToInt) -> None: ...
def __init__(self, thresh: ConvertibleToInt) -> None: ...
class GlowEffect(ColorChoice):
rad: Float[Literal[False]]
@@ -124,7 +115,7 @@ class GlowEffect(ColorChoice):
# schemeClr = ColorChoice.schemeClr
# prstClr = ColorChoice.prstClr
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, rad: _ConvertibleToFloat, **kw) -> None: ...
def __init__(self, rad: ConvertibleToFloat, **kw) -> None: ...
class InnerShadowEffect(ColorChoice):
blurRad: Float[Literal[False]]
@@ -138,7 +129,7 @@ class InnerShadowEffect(ColorChoice):
# schemeClr = ColorChoice.schemeClr
# prstClr = ColorChoice.prstClr
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, blurRad: _ConvertibleToFloat, dist: _ConvertibleToFloat, dir: _ConvertibleToInt, **kw) -> None: ...
def __init__(self, blurRad: ConvertibleToFloat, dist: ConvertibleToFloat, dir: ConvertibleToInt, **kw) -> None: ...
class OuterShadow(ColorChoice):
tagname: ClassVar[str]
@@ -162,13 +153,13 @@ class OuterShadow(ColorChoice):
@overload
def __init__(
self,
blurRad: _ConvertibleToFloat | None = None,
dist: _ConvertibleToFloat | None = None,
dir: _ConvertibleToInt | None = None,
sx: _ConvertibleToInt | None = None,
sy: _ConvertibleToInt | None = None,
kx: _ConvertibleToInt | None = None,
ky: _ConvertibleToInt | None = None,
blurRad: ConvertibleToFloat | None = None,
dist: ConvertibleToFloat | None = None,
dir: ConvertibleToInt | None = None,
sx: ConvertibleToInt | None = None,
sy: ConvertibleToInt | None = None,
kx: ConvertibleToInt | None = None,
ky: ConvertibleToInt | None = None,
*,
algn: _Algn,
rotWithShape: _ConvertibleToBool | None = None,
@@ -177,13 +168,13 @@ class OuterShadow(ColorChoice):
@overload
def __init__(
self,
blurRad: _ConvertibleToFloat | None,
dist: _ConvertibleToFloat | None,
dir: _ConvertibleToInt | None,
sx: _ConvertibleToInt | None,
sy: _ConvertibleToInt | None,
kx: _ConvertibleToInt | None,
ky: _ConvertibleToInt | None,
blurRad: ConvertibleToFloat | None,
dist: ConvertibleToFloat | None,
dir: ConvertibleToInt | None,
sx: ConvertibleToInt | None,
sy: ConvertibleToInt | None,
kx: ConvertibleToInt | None,
ky: ConvertibleToInt | None,
algn: _Algn,
rotWithShape: _ConvertibleToBool | None = None,
**kw,
@@ -201,7 +192,7 @@ class PresetShadowEffect(ColorChoice):
# schemeClr = ColorChoice.schemeClr
# prstClr = ColorChoice.prstClr
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, prst: _PresetShadowEffectPrst, dist: _ConvertibleToFloat, dir: _ConvertibleToInt, **kw) -> None: ...
def __init__(self, prst: _PresetShadowEffectPrst, dist: ConvertibleToFloat, dir: ConvertibleToInt, **kw) -> None: ...
class ReflectionEffect(Serialisable):
blurRad: Float[Literal[False]]
@@ -220,25 +211,25 @@ class ReflectionEffect(Serialisable):
rotWithShape: Bool[Literal[True]]
def __init__(
self,
blurRad: _ConvertibleToFloat,
stA: _ConvertibleToInt,
stPos: _ConvertibleToInt,
endA: _ConvertibleToInt,
endPos: _ConvertibleToInt,
dist: _ConvertibleToFloat,
dir: _ConvertibleToInt,
fadeDir: _ConvertibleToInt,
sx: _ConvertibleToInt,
sy: _ConvertibleToInt,
kx: _ConvertibleToInt,
ky: _ConvertibleToInt,
blurRad: ConvertibleToFloat,
stA: ConvertibleToInt,
stPos: ConvertibleToInt,
endA: ConvertibleToInt,
endPos: ConvertibleToInt,
dist: ConvertibleToFloat,
dir: ConvertibleToInt,
fadeDir: ConvertibleToInt,
sx: ConvertibleToInt,
sy: ConvertibleToInt,
kx: ConvertibleToInt,
ky: ConvertibleToInt,
algn: _Algn,
rotWithShape: _ConvertibleToBool | None = None,
) -> None: ...
class SoftEdgesEffect(Serialisable):
rad: Float[Literal[False]]
def __init__(self, rad: _ConvertibleToFloat) -> None: ...
def __init__(self, rad: ConvertibleToFloat) -> None: ...
class EffectList(Serialisable):
blur: Typed[BlurEffect, Literal[True]]

View File

@@ -1,19 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Alias,
Bool,
Integer,
MinMax,
NoneSet,
Set,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedNoneSet, NestedValue, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -154,7 +143,7 @@ class GradientStop(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
pos: _ConvertibleToFloat | None = None,
pos: ConvertibleToFloat | None = None,
scrgbClr: _RGBPercent | None = None,
srgbClr: _HasTagAndGet[_RGBPercent | None] | _RGBPercent | None = None,
hslClr: HSLColor | None = None,
@@ -168,7 +157,7 @@ class LinearShadeProperties(Serialisable):
namespace: ClassVar[str]
ang: Integer[Literal[False]]
scaled: Bool[Literal[True]]
def __init__(self, ang: _ConvertibleToInt, scaled: _ConvertibleToBool | None = None) -> None: ...
def __init__(self, ang: ConvertibleToInt, scaled: _ConvertibleToBool | None = None) -> None: ...
class PathShadeProperties(Serialisable):
tagname: ClassVar[str]
@@ -299,10 +288,10 @@ class TileInfoProperties(Serialisable):
algn: Set[_TileInfoPropertiesAlgn]
def __init__(
self,
tx: _ConvertibleToInt | None = None,
ty: _ConvertibleToInt | None = None,
sx: _ConvertibleToInt | None = None,
sy: _ConvertibleToInt | None = None,
tx: ConvertibleToInt | None = None,
ty: ConvertibleToInt | None = None,
sx: ConvertibleToInt | None = None,
sy: ConvertibleToInt | None = None,
flip: _PropertiesFlip | Literal["none"] | None = None,
*,
algn: _TileInfoPropertiesAlgn,
@@ -319,7 +308,7 @@ class BlipFillProperties(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
dpi: _ConvertibleToInt | None = None,
dpi: ConvertibleToInt | None = None,
rotWithShape: _ConvertibleToBool | None = None,
blip: Blip | None = None,
tile: TileInfoProperties | None = None,

View File

@@ -1,21 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Alias,
Bool,
Float,
Integer,
MinMax,
NoneSet,
Set,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Alias, Bool, Float, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import Coordinate, ExtensionList, Percentage
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.colors import Color
@@ -351,7 +338,7 @@ class PositiveSize2D(Serialisable):
width: Alias
cy: Integer[Literal[False]]
height: Alias
def __init__(self, cx: _ConvertibleToInt, cy: _ConvertibleToInt) -> None: ...
def __init__(self, cx: ConvertibleToInt, cy: ConvertibleToInt) -> None: ...
class Transform2D(Serialisable):
tagname: ClassVar[str]
@@ -366,7 +353,7 @@ class Transform2D(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
rot: _ConvertibleToInt | None = None,
rot: ConvertibleToInt | None = None,
flipH: _ConvertibleToBool | None = None,
flipV: _ConvertibleToBool | None = None,
off: Point2D | None = None,
@@ -388,7 +375,7 @@ class GroupTransform2D(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
rot: _ConvertibleToInt | None = 0,
rot: ConvertibleToInt | None = 0,
flipH: _ConvertibleToBool | None = None,
flipV: _ConvertibleToBool | None = None,
off: Point2D | None = None,
@@ -402,7 +389,7 @@ class SphereCoords(Serialisable):
lat: Integer[Literal[False]]
lon: Integer[Literal[False]]
rev: Integer[Literal[False]]
def __init__(self, lat: _ConvertibleToInt, lon: _ConvertibleToInt, rev: _ConvertibleToInt) -> None: ...
def __init__(self, lat: ConvertibleToInt, lon: ConvertibleToInt, rev: ConvertibleToInt) -> None: ...
class Camera(Serialisable):
tagname: ClassVar[str]
@@ -413,7 +400,7 @@ class Camera(Serialisable):
def __init__(
self,
prst: _CameraPrst,
fov: _ConvertibleToInt | None = None,
fov: ConvertibleToInt | None = None,
zoom: Percentage | None = None,
rot: SphereCoords | None = None,
) -> None: ...
@@ -430,14 +417,14 @@ class Vector3D(Serialisable):
dx: Integer[Literal[False]]
dy: Integer[Literal[False]]
dz: Integer[Literal[False]]
def __init__(self, dx: _ConvertibleToInt, dy: _ConvertibleToInt, dz: _ConvertibleToInt) -> None: ...
def __init__(self, dx: ConvertibleToInt, dy: ConvertibleToInt, dz: ConvertibleToInt) -> None: ...
class Point3D(Serialisable):
tagname: ClassVar[str]
x: Integer[Literal[False]]
y: Integer[Literal[False]]
z: Integer[Literal[False]]
def __init__(self, x: _ConvertibleToInt, y: _ConvertibleToInt, z: _ConvertibleToInt) -> None: ...
def __init__(self, x: ConvertibleToInt, y: ConvertibleToInt, z: ConvertibleToInt) -> None: ...
class Backdrop(Serialisable):
anchor: Typed[Point3D, Literal[False]]
@@ -460,7 +447,7 @@ class Bevel(Serialisable):
w: Integer[Literal[False]]
h: Integer[Literal[False]]
prst: NoneSet[_BevelPrst]
def __init__(self, w: _ConvertibleToInt, h: _ConvertibleToInt, prst: _BevelPrst | Literal["none"] | None = None) -> None: ...
def __init__(self, w: ConvertibleToInt, h: ConvertibleToInt, prst: _BevelPrst | Literal["none"] | None = None) -> None: ...
class Shape3D(Serialisable):
namespace: ClassVar[str]
@@ -476,8 +463,8 @@ class Shape3D(Serialisable):
def __init__(
self,
z: Coordinate[bool] | None = None,
extrusionH: _ConvertibleToInt | None = None,
contourW: _ConvertibleToInt | None = None,
extrusionH: ConvertibleToInt | None = None,
contourW: ConvertibleToInt | None = None,
prstMaterial: _Shape3DPrstMaterial | Literal["none"] | None = None,
bevelT: Bevel | None = None,
bevelB: Bevel | None = None,
@@ -494,8 +481,8 @@ class Path2D(Serialisable):
extrusionOk: Bool[Literal[True]]
def __init__(
self,
w: _ConvertibleToFloat,
h: _ConvertibleToFloat,
w: ConvertibleToFloat,
h: ConvertibleToFloat,
fill: _Path2DFill | Literal["none"] | None = None,
stroke: _ConvertibleToBool | None = None,
extrusionOk: _ConvertibleToBool | None = None,
@@ -522,7 +509,7 @@ class AdjPoint2D(Serialisable):
class ConnectionSite(Serialisable):
ang: MinMax[float, Literal[False]]
pos: Typed[AdjPoint2D, Literal[False]]
def __init__(self, ang: _ConvertibleToFloat, pos: AdjPoint2D) -> None: ...
def __init__(self, ang: ConvertibleToFloat, pos: AdjPoint2D) -> None: ...
class ConnectionSiteList(Serialisable):
cxn: Typed[ConnectionSite, Literal[True]]
@@ -580,7 +567,7 @@ class FontReference(Serialisable):
class StyleMatrixReference(Serialisable):
idx: Integer[Literal[False]]
def __init__(self, idx: _ConvertibleToInt) -> None: ...
def __init__(self, idx: ConvertibleToInt) -> None: ...
class ShapeStyle(Serialisable):
lnRef: Typed[StyleMatrixReference, Literal[False]]

View File

@@ -1,17 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Alias,
Integer,
MinMax,
NoneSet,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Alias, Integer, MinMax, NoneSet, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import EmptyTag, NestedInteger, NestedNoneSet, _NestedNoneSetParam
from openpyxl.descriptors.serialisable import Serialisable
@@ -49,7 +40,7 @@ class DashStop(Serialisable):
length: Alias
sp: Integer[Literal[False]]
space: Alias
def __init__(self, d: _ConvertibleToInt = 0, sp: _ConvertibleToInt = 0) -> None: ...
def __init__(self, d: ConvertibleToInt = 0, sp: ConvertibleToInt = 0) -> None: ...
class DashStopList(Serialisable):
ds: Incomplete
@@ -79,7 +70,7 @@ class LineProperties(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
w: _ConvertibleToFloat | None = None,
w: ConvertibleToFloat | None = None,
cap: _LinePropertiesCap | Literal["none"] | None = None,
cmpd: _LinePropertiesCmpd | Literal["none"] | None = None,
algn: _LinePropertiesAlgn | Literal["none"] | None = None,
@@ -91,7 +82,7 @@ class LineProperties(Serialisable):
custDash: DashStop | None = None,
round: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
bevel: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
miter: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
miter: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
headEnd: LineEndProperties | None = None,
tailEnd: LineEndProperties | None = None,
extLst: Unused = None,

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool
from openpyxl.descriptors.nested import NestedText
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.drawing.connector import Shape
@@ -26,7 +26,7 @@ class AnchorMarker(Serialisable):
row: NestedText[int, Literal[False]]
rowOff: NestedText[int, Literal[False]]
def __init__(
self, col: _ConvertibleToInt = 0, colOff: _ConvertibleToInt = 0, row: _ConvertibleToInt = 0, rowOff: _ConvertibleToInt = 0
self, col: ConvertibleToInt = 0, colOff: ConvertibleToInt = 0, row: ConvertibleToInt = 0, rowOff: ConvertibleToInt = 0
) -> None: ...
class _AnchorBase(Serialisable):

View File

@@ -1,20 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Alias,
Bool,
Integer,
MinMax,
NoneSet,
Set,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import Coordinate, ExtensionList
from openpyxl.descriptors.nested import EmptyTag, NestedBool, NestedInteger, NestedText, NestedValue
from openpyxl.descriptors.serialisable import Serialisable
@@ -187,8 +175,8 @@ class Font(Serialisable):
self,
typeface: str,
panose: Incomplete | None = None,
pitchFamily: _ConvertibleToFloat | None = None,
charset: _ConvertibleToInt | None = None,
pitchFamily: ConvertibleToFloat | None = None,
charset: ConvertibleToInt | None = None,
) -> None: ...
class CharacterProperties(Serialisable):
@@ -241,21 +229,21 @@ class CharacterProperties(Serialisable):
kumimoji: _ConvertibleToBool | None = None,
lang: str | None = None,
altLang: str | None = None,
sz: _ConvertibleToFloat | None = None,
sz: ConvertibleToFloat | None = None,
b: _ConvertibleToBool | None = None,
i: _ConvertibleToBool | None = None,
u: _CharacterPropertiesU | Literal["none"] | None = None,
strike: _CharacterPropertiesStrike | Literal["none"] | None = None,
kern: _ConvertibleToInt | None = None,
kern: ConvertibleToInt | None = None,
cap: _CharacterPropertiesCap | Literal["none"] | None = None,
spc: _ConvertibleToInt | None = None,
spc: ConvertibleToInt | None = None,
normalizeH: _ConvertibleToBool | None = None,
baseline: _ConvertibleToInt | None = None,
baseline: ConvertibleToInt | None = None,
noProof: _ConvertibleToBool | None = None,
dirty: _ConvertibleToBool | None = None,
err: _ConvertibleToBool | None = None,
smtClean: _ConvertibleToBool | None = None,
smtId: _ConvertibleToInt | None = None,
smtId: ConvertibleToInt | None = None,
bmk: str | None = None,
ln: LineProperties | None = None,
highlight: Color | None = None,
@@ -296,14 +284,14 @@ class Spacing(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
spcPct: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
spcPts: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
spcPct: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
spcPts: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
) -> None: ...
class AutonumberBullet(Serialisable):
type: Set[_AutonumberBulletType]
startAt: Integer[Literal[False]]
def __init__(self, type: _AutonumberBulletType, startAt: _ConvertibleToInt) -> None: ...
def __init__(self, type: _AutonumberBulletType, startAt: ConvertibleToInt) -> None: ...
class ParagraphProperties(Serialisable):
tagname: ClassVar[str]
@@ -339,12 +327,12 @@ class ParagraphProperties(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
marL: _ConvertibleToInt | None = None,
marR: _ConvertibleToInt | None = None,
lvl: _ConvertibleToInt | None = None,
indent: _ConvertibleToInt | None = None,
marL: ConvertibleToInt | None = None,
marR: ConvertibleToInt | None = None,
lvl: ConvertibleToInt | None = None,
indent: ConvertibleToInt | None = None,
algn: _ParagraphPropertiesAlgn | Literal["none"] | None = None,
defTabSz: _ConvertibleToInt | None = None,
defTabSz: ConvertibleToInt | None = None,
rtl: _ConvertibleToBool | None = None,
eaLnBrk: _ConvertibleToBool | None = None,
fontAlgn: _ParagraphPropertiesFontAlgn | Literal["none"] | None = None,
@@ -359,8 +347,8 @@ class ParagraphProperties(Serialisable):
buClrTx: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
buClr: Color | None = None,
buSzTx: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
buSzPct: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
buSzPts: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
buSzPct: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
buSzPts: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
buFontTx: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
buFont: Font | None = None,
buNone: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
@@ -469,7 +457,7 @@ class PresetTextShape(Serialisable):
class TextNormalAutofit(Serialisable):
fontScale: Integer[Literal[False]]
lnSpcReduction: Integer[Literal[False]]
def __init__(self, fontScale: _ConvertibleToInt, lnSpcReduction: _ConvertibleToInt) -> None: ...
def __init__(self, fontScale: ConvertibleToInt, lnSpcReduction: ConvertibleToInt) -> None: ...
class RichTextProperties(Serialisable):
tagname: ClassVar[str]
@@ -503,18 +491,18 @@ class RichTextProperties(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
rot: _ConvertibleToInt | None = None,
rot: ConvertibleToInt | None = None,
spcFirstLastPara: _ConvertibleToBool | None = None,
vertOverflow: _RichTextPropertiesVertOverflow | Literal["none"] | None = None,
horzOverflow: _RichTextPropertiesHorzOverflow | Literal["none"] | None = None,
vert: _RichTextPropertiesVert | Literal["none"] | None = None,
wrap: _RichTextPropertiesWrap | Literal["none"] | None = None,
lIns: _ConvertibleToInt | None = None,
tIns: _ConvertibleToInt | None = None,
rIns: _ConvertibleToInt | None = None,
bIns: _ConvertibleToInt | None = None,
numCol: _ConvertibleToInt | None = None,
spcCol: _ConvertibleToInt | None = None,
lIns: ConvertibleToInt | None = None,
tIns: ConvertibleToInt | None = None,
rIns: ConvertibleToInt | None = None,
bIns: ConvertibleToInt | None = None,
numCol: ConvertibleToInt | None = None,
spcCol: ConvertibleToInt | None = None,
rtlCol: _ConvertibleToBool | None = None,
fromWordArt: _ConvertibleToBool | None = None,
anchor: _RichTextPropertiesAnchor | Literal["none"] | None = None,
@@ -528,5 +516,5 @@ class RichTextProperties(Serialisable):
noAutofit: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
normAutofit: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
spAutoFit: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
flatTx: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
flatTx: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
) -> None: ...

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors import Float, Strict
from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.colors import Color, ColorDescriptor
@@ -113,8 +113,8 @@ class DataBar(RuleType):
@overload
def __init__(
self,
minLength: _ConvertibleToInt | None = None,
maxLength: _ConvertibleToInt | None = None,
minLength: ConvertibleToInt | None = None,
maxLength: ConvertibleToInt | None = None,
showValue: _ConvertibleToBool | None = None,
cfvo: Incomplete | None = None,
*,
@@ -123,8 +123,8 @@ class DataBar(RuleType):
@overload
def __init__(
self,
minLength: _ConvertibleToInt | None,
maxLength: _ConvertibleToInt | None,
minLength: ConvertibleToInt | None,
maxLength: ConvertibleToInt | None,
showValue: _ConvertibleToBool | None,
cfvo: Incomplete | None,
color: str | Color,
@@ -163,8 +163,8 @@ class Rule(Serialisable):
def __init__(
self,
type: _RuleType,
dxfId: _ConvertibleToInt | None = None,
priority: _ConvertibleToInt = 0,
dxfId: ConvertibleToInt | None = None,
priority: ConvertibleToInt = 0,
stopIfTrue: _ConvertibleToBool | None = None,
aboveAverage: _ConvertibleToBool | None = None,
percent: _ConvertibleToBool | None = None,
@@ -172,8 +172,8 @@ class Rule(Serialisable):
operator: _RuleOperator | Literal["none"] | None = None,
text: str | None = None,
timePeriod: _RuleTimePeriod | Literal["none"] | None = None,
rank: _ConvertibleToInt | None = None,
stdDev: _ConvertibleToInt | None = None,
rank: ConvertibleToInt | None = None,
stdDev: ConvertibleToInt | None = None,
equalAverage: _ConvertibleToBool | None = None,
formula=(),
colorScale: ColorScale | None = None,

View File

@@ -1,20 +1,11 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from collections.abc import Iterator
from datetime import datetime
from typing import Any, Generic, TypeVar
from typing_extensions import Final, Literal, Self, TypeAlias
from openpyxl.descriptors import Sequence, Strict
from openpyxl.descriptors.base import (
Bool,
DateTime,
Float,
Integer,
String,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.nested import NestedText
from openpyxl.descriptors.serialisable import _ChildSerialisableTreeElement
@@ -32,10 +23,10 @@ class _TypedProperty(Strict, Generic[_T]):
def __init__(self, name: str, value: _T) -> None: ...
def __eq__(self, other: _TypedProperty[Any]) -> bool: ... # type: ignore[override]
class IntProperty(_TypedProperty[_ConvertibleToInt]):
class IntProperty(_TypedProperty[ConvertibleToInt]):
value: Integer[Literal[False]]
class FloatProperty(_TypedProperty[_ConvertibleToFloat]):
class FloatProperty(_TypedProperty[ConvertibleToFloat]):
value: Float[Literal[False]]
class StringProperty(_TypedProperty[str | None]):

View File

@@ -1,8 +1,8 @@
from _typeshed import Unused
from _typeshed import ConvertibleToInt, Unused
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Typed, _ConvertibleToInt
from openpyxl.descriptors.base import Typed
from openpyxl.descriptors.nested import NestedText
from openpyxl.descriptors.serialisable import Serialisable
@@ -55,22 +55,22 @@ class ExtendedProperties(Serialisable):
Template: object = None,
Manager: object = None,
Company: object = None,
Pages: _ConvertibleToInt | None = None,
Words: _ConvertibleToInt | None = None,
Characters: _ConvertibleToInt | None = None,
Pages: ConvertibleToInt | None = None,
Words: ConvertibleToInt | None = None,
Characters: ConvertibleToInt | None = None,
PresentationFormat: object = None,
Lines: _ConvertibleToInt | None = None,
Paragraphs: _ConvertibleToInt | None = None,
Slides: _ConvertibleToInt | None = None,
Notes: _ConvertibleToInt | None = None,
TotalTime: _ConvertibleToInt | None = None,
HiddenSlides: _ConvertibleToInt | None = None,
MMClips: _ConvertibleToInt | None = None,
Lines: ConvertibleToInt | None = None,
Paragraphs: ConvertibleToInt | None = None,
Slides: ConvertibleToInt | None = None,
Notes: ConvertibleToInt | None = None,
TotalTime: ConvertibleToInt | None = None,
HiddenSlides: ConvertibleToInt | None = None,
MMClips: ConvertibleToInt | None = None,
ScaleCrop: object = None,
HeadingPairs: Unused = None,
TitlesOfParts: Unused = None,
LinksUpToDate: object = None,
CharactersWithSpaces: _ConvertibleToInt | None = None,
CharactersWithSpaces: ConvertibleToInt | None = None,
SharedDoc: object = None,
HyperlinkBase: object = None,
HLinks: Unused = None,
@@ -78,6 +78,6 @@ class ExtendedProperties(Serialisable):
DigSig: Unused = None,
Application: object = "Microsoft Excel",
AppVersion: object = None,
DocSecurity: _ConvertibleToInt | None = None,
DocSecurity: ConvertibleToInt | None = None,
) -> None: ...
def to_tree(self): ...

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl import _VisibilityType
from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedString
from openpyxl.descriptors.serialisable import Serialisable
@@ -39,7 +39,7 @@ class ChildSheet(Serialisable):
def __init__(
self,
name: str,
sheetId: _ConvertibleToInt,
sheetId: ConvertibleToInt,
state: _VisibilityType | Literal["none"] | None = "visible",
id: Incomplete | None = None,
) -> None: ...
@@ -48,7 +48,7 @@ class PivotCache(Serialisable):
tagname: ClassVar[str]
cacheId: Integer[Literal[False]]
id: Incomplete
def __init__(self, cacheId: _ConvertibleToInt, id: Incomplete | None = None) -> None: ...
def __init__(self, cacheId: ConvertibleToInt, id: Incomplete | None = None) -> None: ...
class WorkbookPackage(Serialisable):
tagname: ClassVar[str]

View File

@@ -1,20 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from datetime import datetime
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Bool,
DateTime,
Float,
Integer,
Set,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.nested import NestedInteger
from openpyxl.descriptors.serialisable import Serialisable
@@ -30,7 +19,7 @@ class MeasureDimensionMap(Serialisable):
tagname: ClassVar[str]
measureGroup: Integer[Literal[True]]
dimension: Integer[Literal[True]]
def __init__(self, measureGroup: _ConvertibleToInt | None = None, dimension: _ConvertibleToInt | None = None) -> None: ...
def __init__(self, measureGroup: ConvertibleToInt | None = None, dimension: ConvertibleToInt | None = None) -> None: ...
class MeasureGroup(Serialisable):
tagname: ClassVar[str]
@@ -67,7 +56,7 @@ class CalculatedMember(Serialisable):
memberName: str,
hierarchy: str,
parent: str,
solveOrder: _ConvertibleToInt,
solveOrder: ConvertibleToInt,
set: _ConvertibleToBool = None,
extLst: Unused = None,
) -> None: ...
@@ -81,11 +70,11 @@ class CalculatedItem(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
@overload
def __init__(
self, field: _ConvertibleToInt | None = None, *, formula: str, pivotArea: PivotArea, extLst: Incomplete | None = None
self, field: ConvertibleToInt | None = None, *, formula: str, pivotArea: PivotArea, extLst: Incomplete | None = None
) -> None: ...
@overload
def __init__(
self, field: _ConvertibleToInt | None, formula: str, pivotArea: PivotArea, extLst: Incomplete | None = None
self, field: ConvertibleToInt | None, formula: str, pivotArea: PivotArea, extLst: Incomplete | None = None
) -> None: ...
class ServerFormat(Serialisable):
@@ -115,7 +104,7 @@ class QueryCache(Serialisable):
count: Integer[Literal[False]]
query: Typed[Query, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, query: Query) -> None: ...
def __init__(self, count: ConvertibleToInt, query: Query) -> None: ...
class OLAPSet(Serialisable):
tagname: ClassVar[str]
@@ -129,8 +118,8 @@ class OLAPSet(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
count: _ConvertibleToInt,
maxRank: _ConvertibleToInt,
count: ConvertibleToInt,
maxRank: ConvertibleToInt,
setDefinition: str,
sortType: Incomplete | None = None,
queryFailed: _ConvertibleToBool = None,
@@ -142,7 +131,7 @@ class OLAPSets(Serialisable):
count: Integer[Literal[False]]
set: Typed[OLAPSet, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, set: OLAPSet) -> None: ...
def __init__(self, count: ConvertibleToInt, set: OLAPSet) -> None: ...
class PCDSDTCEntries(Serialisable):
tagname: ClassVar[str]
@@ -152,7 +141,7 @@ class PCDSDTCEntries(Serialisable):
e: Typed[Error, Literal[False]]
s: Typed[Text, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, m: Missing, n: Number, e: Error, s: Text) -> None: ...
def __init__(self, count: ConvertibleToInt, m: Missing, n: Number, e: Error, s: Text) -> None: ...
class TupleCache(Serialisable):
tagname: ClassVar[str]
@@ -226,7 +215,7 @@ class GroupMembers(Serialisable):
count: Integer[Literal[False]]
groupMember: Typed[GroupMember, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, groupMember: GroupMember) -> None: ...
def __init__(self, count: ConvertibleToInt, groupMember: GroupMember) -> None: ...
class LevelGroup(Serialisable):
tagname: ClassVar[str]
@@ -238,7 +227,7 @@ class LevelGroup(Serialisable):
groupMembers: Typed[GroupMembers, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self, name: str, uniqueName: str, caption: str, uniqueParent: str, id: _ConvertibleToInt, groupMembers: GroupMembers
self, name: str, uniqueName: str, caption: str, uniqueParent: str, id: ConvertibleToInt, groupMembers: GroupMembers
) -> None: ...
class Groups(Serialisable):
@@ -246,7 +235,7 @@ class Groups(Serialisable):
count: Integer[Literal[False]]
group: Typed[LevelGroup, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, group: LevelGroup) -> None: ...
def __init__(self, count: ConvertibleToInt, group: LevelGroup) -> None: ...
class GroupLevel(Serialisable):
tagname: ClassVar[str]
@@ -271,18 +260,18 @@ class GroupLevels(Serialisable):
count: Integer[Literal[False]]
groupLevel: Typed[GroupLevel, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, groupLevel: GroupLevel) -> None: ...
def __init__(self, count: ConvertibleToInt, groupLevel: GroupLevel) -> None: ...
class FieldUsage(Serialisable):
tagname: ClassVar[str]
x: Integer[Literal[False]]
def __init__(self, x: _ConvertibleToInt) -> None: ...
def __init__(self, x: ConvertibleToInt) -> None: ...
class FieldsUsage(Serialisable):
count: Integer[Literal[False]]
fieldUsage: Typed[FieldUsage, Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, fieldUsage: FieldUsage | None = None) -> None: ...
def __init__(self, count: ConvertibleToInt, fieldUsage: FieldUsage | None = None) -> None: ...
class CacheHierarchy(Serialisable):
tagname: ClassVar[str]
@@ -319,8 +308,8 @@ class CacheHierarchy(Serialisable):
caption: str | None = None,
measure: _ConvertibleToBool = None,
set: _ConvertibleToBool = None,
parentSet: _ConvertibleToInt | None = None,
iconSet: _ConvertibleToInt = 0,
parentSet: ConvertibleToInt | None = None,
iconSet: ConvertibleToInt = 0,
attribute: _ConvertibleToBool = None,
time: _ConvertibleToBool = None,
keyAttribute: _ConvertibleToBool = None,
@@ -332,9 +321,9 @@ class CacheHierarchy(Serialisable):
measureGroup: str | None = None,
measures: _ConvertibleToBool = None,
*,
count: _ConvertibleToInt,
count: ConvertibleToInt,
oneField: _ConvertibleToBool = None,
memberValueDatatype: _ConvertibleToInt | None = None,
memberValueDatatype: ConvertibleToInt | None = None,
unbalanced: _ConvertibleToBool | None = None,
unbalancedGroup: _ConvertibleToBool | None = None,
hidden: _ConvertibleToBool = None,
@@ -349,8 +338,8 @@ class CacheHierarchy(Serialisable):
caption: str | None,
measure: _ConvertibleToBool,
set: _ConvertibleToBool,
parentSet: _ConvertibleToInt | None,
iconSet: _ConvertibleToInt,
parentSet: ConvertibleToInt | None,
iconSet: ConvertibleToInt,
attribute: _ConvertibleToBool,
time: _ConvertibleToBool,
keyAttribute: _ConvertibleToBool,
@@ -361,9 +350,9 @@ class CacheHierarchy(Serialisable):
displayFolder: str | None,
measureGroup: str | None,
measures: _ConvertibleToBool,
count: _ConvertibleToInt,
count: ConvertibleToInt,
oneField: _ConvertibleToBool = None,
memberValueDatatype: _ConvertibleToInt | None = None,
memberValueDatatype: ConvertibleToInt | None = None,
unbalanced: _ConvertibleToBool | None = None,
unbalancedGroup: _ConvertibleToBool | None = None,
hidden: _ConvertibleToBool = None,
@@ -392,7 +381,7 @@ class DiscretePr(Serialisable):
x: NestedInteger[Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self, count: _ConvertibleToInt, x: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None
self, count: ConvertibleToInt, x: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None
) -> None: ...
class RangePr(Serialisable):
@@ -410,11 +399,11 @@ class RangePr(Serialisable):
autoStart: _ConvertibleToBool | None = True,
autoEnd: _ConvertibleToBool | None = True,
groupBy: _RangePrGroupBy = "range",
startNum: _ConvertibleToFloat | None = None,
endNum: _ConvertibleToFloat | None = None,
startNum: ConvertibleToFloat | None = None,
endNum: ConvertibleToFloat | None = None,
startDate: datetime | str | None = None,
endDate: datetime | str | None = None,
groupInterval: _ConvertibleToFloat | None = 1,
groupInterval: ConvertibleToFloat | None = 1,
) -> None: ...
class FieldGroup(Serialisable):
@@ -427,8 +416,8 @@ class FieldGroup(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
par: _ConvertibleToInt | None = None,
base: _ConvertibleToInt | None = None,
par: ConvertibleToInt | None = None,
base: ConvertibleToInt | None = None,
rangePr: RangePr | None = None,
discretePr: DiscretePr | None = None,
groupItems: GroupItems | None = None,
@@ -467,8 +456,8 @@ class SharedItems(Serialisable):
containsMixedTypes: _ConvertibleToBool | None = None,
containsNumber: _ConvertibleToBool | None = None,
containsInteger: _ConvertibleToBool | None = None,
minValue: _ConvertibleToFloat | None = None,
maxValue: _ConvertibleToFloat | None = None,
minValue: ConvertibleToFloat | None = None,
maxValue: ConvertibleToFloat | None = None,
minDate: datetime | str | None = None,
maxDate: datetime | str | None = None,
count: Unused = None,
@@ -502,7 +491,7 @@ class CacheField(Serialisable):
self,
sharedItems: SharedItems | None = None,
fieldGroup: FieldGroup | None = None,
mpMap: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
mpMap: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
extLst: ExtensionList | None = None,
*,
name: str,
@@ -510,13 +499,13 @@ class CacheField(Serialisable):
propertyName: str | None = None,
serverField: _ConvertibleToBool | None = None,
uniqueList: _ConvertibleToBool | None = True,
numFmtId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt | None = None,
formula: str | None = None,
sqlType: _ConvertibleToInt | None = 0,
hierarchy: _ConvertibleToInt | None = 0,
level: _ConvertibleToInt | None = 0,
sqlType: ConvertibleToInt | None = 0,
hierarchy: ConvertibleToInt | None = 0,
level: ConvertibleToInt | None = 0,
databaseField: _ConvertibleToBool | None = True,
mappingCount: _ConvertibleToInt | None = None,
mappingCount: ConvertibleToInt | None = None,
memberPropertyField: _ConvertibleToBool | None = None,
) -> None: ...
@overload
@@ -531,13 +520,13 @@ class CacheField(Serialisable):
propertyName: str | None = None,
serverField: _ConvertibleToBool | None = None,
uniqueList: _ConvertibleToBool | None = True,
numFmtId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt | None = None,
formula: str | None = None,
sqlType: _ConvertibleToInt | None = 0,
hierarchy: _ConvertibleToInt | None = 0,
level: _ConvertibleToInt | None = 0,
sqlType: ConvertibleToInt | None = 0,
hierarchy: ConvertibleToInt | None = 0,
level: ConvertibleToInt | None = 0,
databaseField: _ConvertibleToBool | None = True,
mappingCount: _ConvertibleToInt | None = None,
mappingCount: ConvertibleToInt | None = None,
memberPropertyField: _ConvertibleToBool | None = None,
) -> None: ...
@@ -553,10 +542,10 @@ class RangeSet(Serialisable):
@overload
def __init__(
self,
i1: _ConvertibleToInt | None = None,
i2: _ConvertibleToInt | None = None,
i3: _ConvertibleToInt | None = None,
i4: _ConvertibleToInt | None = None,
i1: ConvertibleToInt | None = None,
i2: ConvertibleToInt | None = None,
i3: ConvertibleToInt | None = None,
i4: ConvertibleToInt | None = None,
*,
ref: str,
name: str | None = None,
@@ -565,10 +554,10 @@ class RangeSet(Serialisable):
@overload
def __init__(
self,
i1: _ConvertibleToInt | None,
i2: _ConvertibleToInt | None,
i3: _ConvertibleToInt | None,
i4: _ConvertibleToInt | None,
i1: ConvertibleToInt | None,
i2: ConvertibleToInt | None,
i3: ConvertibleToInt | None,
i4: ConvertibleToInt | None,
ref: str,
name: str | None = None,
sheet: str | None = None,
@@ -613,7 +602,7 @@ class CacheSource(Serialisable):
def __init__(
self,
type: _CacheSourceType,
connectionId: _ConvertibleToInt | None = None,
connectionId: ConvertibleToInt | None = None,
worksheetSource: WorksheetSource | None = None,
consolidation: Consolidation | None = None,
extLst: ExtensionList | None = None,
@@ -663,14 +652,14 @@ class CacheDefinition(Serialisable):
optimizeMemory: _ConvertibleToBool | None = None,
enableRefresh: _ConvertibleToBool | None = None,
refreshedBy: str | None = None,
refreshedDate: _ConvertibleToFloat | None = None,
refreshedDate: ConvertibleToFloat | None = None,
refreshedDateIso: datetime | str | None = None,
backgroundQuery: _ConvertibleToBool | None = None,
missingItemsLimit: _ConvertibleToInt | None = None,
createdVersion: _ConvertibleToInt | None = None,
refreshedVersion: _ConvertibleToInt | None = None,
minRefreshableVersion: _ConvertibleToInt | None = None,
recordCount: _ConvertibleToInt | None = None,
missingItemsLimit: ConvertibleToInt | None = None,
createdVersion: ConvertibleToInt | None = None,
refreshedVersion: ConvertibleToInt | None = None,
minRefreshableVersion: ConvertibleToInt | None = None,
recordCount: ConvertibleToInt | None = None,
upgradeOnRefresh: _ConvertibleToBool | None = None,
tupleCache: TupleCache | None = None,
supportSubquery: _ConvertibleToBool | None = None,
@@ -697,14 +686,14 @@ class CacheDefinition(Serialisable):
optimizeMemory: _ConvertibleToBool | None,
enableRefresh: _ConvertibleToBool | None,
refreshedBy: str | None,
refreshedDate: _ConvertibleToFloat | None,
refreshedDate: ConvertibleToFloat | None,
refreshedDateIso: datetime | str | None,
backgroundQuery: _ConvertibleToBool | None,
missingItemsLimit: _ConvertibleToInt | None,
createdVersion: _ConvertibleToInt | None,
refreshedVersion: _ConvertibleToInt | None,
minRefreshableVersion: _ConvertibleToInt | None,
recordCount: _ConvertibleToInt | None,
missingItemsLimit: ConvertibleToInt | None,
createdVersion: ConvertibleToInt | None,
refreshedVersion: ConvertibleToInt | None,
minRefreshableVersion: ConvertibleToInt | None,
recordCount: ConvertibleToInt | None,
upgradeOnRefresh: _ConvertibleToBool | None,
tupleCache: TupleCache | None,
supportSubquery: _ConvertibleToBool | None,

View File

@@ -1,40 +1,30 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from datetime import datetime
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.descriptors.base import (
Bool,
DateTime,
Float,
Integer,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
class Index(Serialisable):
tagname: ClassVar[str]
v: Integer[Literal[True]]
def __init__(self, v: _ConvertibleToInt | None = 0) -> None: ...
def __init__(self, v: ConvertibleToInt | None = 0) -> None: ...
class Tuple(Serialisable):
fld: Integer[Literal[False]]
hier: Integer[Literal[False]]
item: Integer[Literal[False]]
def __init__(self, fld: _ConvertibleToInt, hier: _ConvertibleToInt, item: _ConvertibleToInt) -> None: ...
def __init__(self, fld: ConvertibleToInt, hier: ConvertibleToInt, item: ConvertibleToInt) -> None: ...
class TupleList(Serialisable):
c: Integer[Literal[True]]
tpl: Typed[Tuple, Literal[False]]
__elements__: ClassVar[tuple[str, ...]]
@overload
def __init__(self, c: _ConvertibleToInt | None = None, *, tpl: Tuple) -> None: ...
def __init__(self, c: ConvertibleToInt | None = None, *, tpl: Tuple) -> None: ...
@overload
def __init__(self, c: _ConvertibleToInt | None, tpl: Tuple) -> None: ...
def __init__(self, c: ConvertibleToInt | None, tpl: Tuple) -> None: ...
class Missing(Serialisable):
tagname: ClassVar[str]
@@ -59,8 +49,8 @@ class Missing(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -92,12 +82,12 @@ class Number(Serialisable):
tpls=(),
x=(),
*,
v: _ConvertibleToFloat,
v: ConvertibleToFloat,
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -110,12 +100,12 @@ class Number(Serialisable):
self,
tpls,
x,
v: _ConvertibleToFloat,
v: ConvertibleToFloat,
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -151,8 +141,8 @@ class Error(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -169,8 +159,8 @@ class Error(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -195,7 +185,7 @@ class Boolean(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
) -> None: ...
class Text(Serialisable):
@@ -223,8 +213,8 @@ class Text(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: Incomplete | None = None,
cp: _ConvertibleToInt | None = None,
_in: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
_in: ConvertibleToInt | None = None,
bc: Incomplete | None = None,
fc: Incomplete | None = None,
i: _ConvertibleToBool | None = None,
@@ -249,5 +239,5 @@ class DateTimeField(Serialisable):
u: _ConvertibleToBool | None = None,
f: _ConvertibleToBool | None = None,
c: str | None = None,
cp: _ConvertibleToInt | None = None,
cp: ConvertibleToInt | None = None,
) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.filters import AutoFilter
@@ -108,7 +108,7 @@ _PivotFieldSortType: TypeAlias = Literal["manual", "ascending", "descending"]
class HierarchyUsage(Serialisable):
tagname: ClassVar[str]
hierarchyUsage: Integer[Literal[False]]
def __init__(self, hierarchyUsage: _ConvertibleToInt) -> None: ...
def __init__(self, hierarchyUsage: ConvertibleToInt) -> None: ...
class ColHierarchiesUsage(Serialisable):
tagname: ClassVar[str]
@@ -147,14 +147,14 @@ class PivotFilter(Serialisable):
@overload
def __init__(
self,
fld: _ConvertibleToInt,
mpFld: _ConvertibleToInt | None = None,
fld: ConvertibleToInt,
mpFld: ConvertibleToInt | None = None,
*,
type: _PivotFilterType,
evalOrder: _ConvertibleToInt | None = None,
id: _ConvertibleToInt,
iMeasureHier: _ConvertibleToInt | None = None,
iMeasureFld: _ConvertibleToInt | None = None,
evalOrder: ConvertibleToInt | None = None,
id: ConvertibleToInt,
iMeasureHier: ConvertibleToInt | None = None,
iMeasureFld: ConvertibleToInt | None = None,
name: str | None = None,
description: str | None = None,
stringValue1: str | None = None,
@@ -165,13 +165,13 @@ class PivotFilter(Serialisable):
@overload
def __init__(
self,
fld: _ConvertibleToInt,
mpFld: _ConvertibleToInt | None,
fld: ConvertibleToInt,
mpFld: ConvertibleToInt | None,
type: _PivotFilterType,
evalOrder: _ConvertibleToInt | None,
id: _ConvertibleToInt,
iMeasureHier: _ConvertibleToInt | None,
iMeasureFld: _ConvertibleToInt | None,
evalOrder: ConvertibleToInt | None,
id: ConvertibleToInt,
iMeasureHier: ConvertibleToInt | None,
iMeasureFld: ConvertibleToInt | None,
name: str | None,
description: str | None,
stringValue1: str | None,
@@ -184,7 +184,7 @@ class PivotFilters(Serialisable):
count: Integer[Literal[False]]
filter: Typed[PivotFilter, Literal[True]]
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: _ConvertibleToInt, filter: PivotFilter | None = None) -> None: ...
def __init__(self, count: ConvertibleToInt, filter: PivotFilter | None = None) -> None: ...
class PivotTableStyle(Serialisable):
tagname: ClassVar[str]
@@ -209,7 +209,7 @@ class MemberList(Serialisable):
level: Integer[Literal[True]]
member: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, count: Incomplete | None = None, level: _ConvertibleToInt | None = None, member=()) -> None: ...
def __init__(self, count: Incomplete | None = None, level: ConvertibleToInt | None = None, member=()) -> None: ...
@property
def count(self) -> int: ...
@@ -231,12 +231,12 @@ class MemberProperty(Serialisable):
showCell: _ConvertibleToBool | None = None,
showTip: _ConvertibleToBool | None = None,
showAsCaption: _ConvertibleToBool | None = None,
nameLen: _ConvertibleToInt | None = None,
pPos: _ConvertibleToInt | None = None,
pLen: _ConvertibleToInt | None = None,
level: _ConvertibleToInt | None = None,
nameLen: ConvertibleToInt | None = None,
pPos: ConvertibleToInt | None = None,
pLen: ConvertibleToInt | None = None,
level: ConvertibleToInt | None = None,
*,
field: _ConvertibleToInt,
field: ConvertibleToInt,
) -> None: ...
@overload
def __init__(
@@ -245,11 +245,11 @@ class MemberProperty(Serialisable):
showCell: _ConvertibleToBool | None,
showTip: _ConvertibleToBool | None,
showAsCaption: _ConvertibleToBool | None,
nameLen: _ConvertibleToInt | None,
pPos: _ConvertibleToInt | None,
pLen: _ConvertibleToInt | None,
level: _ConvertibleToInt | None,
field: _ConvertibleToInt,
nameLen: ConvertibleToInt | None,
pPos: ConvertibleToInt | None,
pLen: ConvertibleToInt | None,
level: ConvertibleToInt | None,
field: ConvertibleToInt,
) -> None: ...
class PivotHierarchy(Serialisable):
@@ -310,7 +310,7 @@ class Reference(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
field: _ConvertibleToInt | None = None,
field: ConvertibleToInt | None = None,
count: Unused = None,
selected: _ConvertibleToBool | None = None,
byPosition: _ConvertibleToBool | None = None,
@@ -354,7 +354,7 @@ class PivotArea(Serialisable):
self,
references=(),
extLst: ExtensionList | None = None,
field: _ConvertibleToInt | None = None,
field: ConvertibleToInt | None = None,
type: _PivotAreaType | Literal["none"] | None = "normal",
dataOnly: _ConvertibleToBool | None = True,
labelOnly: _ConvertibleToBool | None = None,
@@ -365,7 +365,7 @@ class PivotArea(Serialisable):
offset: str | None = None,
collapsedLevelsAreSubtotals: _ConvertibleToBool | None = None,
axis: _PivotAxis | Literal["none"] | None = None,
fieldPosition: _ConvertibleToInt | None = None,
fieldPosition: ConvertibleToInt | None = None,
) -> None: ...
class ChartFormat(Serialisable):
@@ -377,11 +377,11 @@ class ChartFormat(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
@overload
def __init__(
self, chart: _ConvertibleToInt, format: _ConvertibleToInt, series: _ConvertibleToBool = None, *, pivotArea: PivotArea
self, chart: ConvertibleToInt, format: ConvertibleToInt, series: _ConvertibleToBool = None, *, pivotArea: PivotArea
) -> None: ...
@overload
def __init__(
self, chart: _ConvertibleToInt, format: _ConvertibleToInt, series: _ConvertibleToBool, pivotArea: PivotArea
self, chart: ConvertibleToInt, format: ConvertibleToInt, series: _ConvertibleToBool, pivotArea: PivotArea
) -> None: ...
class ConditionalFormat(Serialisable):
@@ -398,7 +398,7 @@ class ConditionalFormat(Serialisable):
scope: _ConditionalFormatScope = "selection",
type: _ConditionalFormatType | Literal["none"] | None = None,
*,
priority: _ConvertibleToInt,
priority: ConvertibleToInt,
pivotAreas=(),
extLst: ExtensionList | None = None,
) -> None: ...
@@ -407,7 +407,7 @@ class ConditionalFormat(Serialisable):
self,
scope: _ConditionalFormatScope,
type: _ConditionalFormatType | Literal["none"] | None,
priority: _ConvertibleToInt,
priority: ConvertibleToInt,
pivotAreas=(),
extLst: ExtensionList | None = None,
) -> None: ...
@@ -433,7 +433,7 @@ class Format(Serialisable):
def __init__(
self,
action: _FormatAction | Literal["none"] | None = "formatting",
dxfId: _ConvertibleToInt | None = None,
dxfId: ConvertibleToInt | None = None,
*,
pivotArea: PivotArea,
extLst: ExtensionList | None = None,
@@ -442,7 +442,7 @@ class Format(Serialisable):
def __init__(
self,
action: _FormatAction | Literal["none"] | None,
dxfId: _ConvertibleToInt | None,
dxfId: ConvertibleToInt | None,
pivotArea: PivotArea,
extLst: ExtensionList | None = None,
) -> None: ...
@@ -463,24 +463,24 @@ class DataField(Serialisable):
self,
name: str | None = None,
*,
fld: _ConvertibleToInt,
fld: ConvertibleToInt,
subtotal: str = "sum",
showDataAs: str = "normal",
baseField: _ConvertibleToInt = -1,
baseItem: _ConvertibleToInt = 1048832,
numFmtId: _ConvertibleToInt | None = None,
baseField: ConvertibleToInt = -1,
baseItem: ConvertibleToInt = 1048832,
numFmtId: ConvertibleToInt | None = None,
extLst: ExtensionList | None = None,
) -> None: ...
@overload
def __init__(
self,
name: str | None,
fld: _ConvertibleToInt,
fld: ConvertibleToInt,
subtotal: str = "sum",
showDataAs: str = "normal",
baseField: _ConvertibleToInt = -1,
baseItem: _ConvertibleToInt = 1048832,
numFmtId: _ConvertibleToInt | None = None,
baseField: ConvertibleToInt = -1,
baseItem: ConvertibleToInt = 1048832,
numFmtId: ConvertibleToInt | None = None,
extLst: ExtensionList | None = None,
) -> None: ...
@@ -495,9 +495,9 @@ class PageField(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
fld: _ConvertibleToInt,
item: _ConvertibleToInt | None = None,
hier: _ConvertibleToInt | None = None,
fld: ConvertibleToInt,
item: ConvertibleToInt | None = None,
hier: ConvertibleToInt | None = None,
name: str | None = None,
cap: str | None = None,
extLst: ExtensionList | None = None,
@@ -510,12 +510,12 @@ class RowColItem(Serialisable):
i: Integer[Literal[False]]
x: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, t: _ItemType = "data", r: _ConvertibleToInt = 0, i: _ConvertibleToInt = 0, x=()) -> None: ...
def __init__(self, t: _ItemType = "data", r: ConvertibleToInt = 0, i: ConvertibleToInt = 0, x=()) -> None: ...
class RowColField(Serialisable):
tagname: ClassVar[str]
x: Integer[Literal[False]]
def __init__(self, x: _ConvertibleToInt) -> None: ...
def __init__(self, x: ConvertibleToInt) -> None: ...
class AutoSortScope(Serialisable):
pivotArea: Typed[PivotArea, Literal[False]]
@@ -545,7 +545,7 @@ class FieldItem(Serialisable):
f: _ConvertibleToBool | None = None,
m: _ConvertibleToBool | None = None,
c: _ConvertibleToBool | None = None,
x: _ConvertibleToInt | None = None,
x: ConvertibleToInt | None = None,
d: _ConvertibleToBool | None = None,
e: _ConvertibleToBool | None = None,
) -> None: ...
@@ -617,7 +617,7 @@ class PivotField(Serialisable):
uniqueMemberProperty: str | None = None,
compact: _ConvertibleToBool | None = True,
allDrilled: _ConvertibleToBool | None = None,
numFmtId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt | None = None,
outline: _ConvertibleToBool | None = True,
subtotalTop: _ConvertibleToBool | None = True,
dragToRow: _ConvertibleToBool | None = True,
@@ -635,11 +635,11 @@ class PivotField(Serialisable):
hideNewItems: _ConvertibleToBool | None = None,
measureFilter: _ConvertibleToBool | None = None,
includeNewItemsInFilter: _ConvertibleToBool | None = None,
itemPageCount: _ConvertibleToInt | None = 10,
itemPageCount: ConvertibleToInt | None = 10,
sortType: _PivotFieldSortType = "manual",
dataSourceSort: _ConvertibleToBool | None = None,
nonAutoSortDefault: _ConvertibleToBool | None = None,
rankBy: _ConvertibleToInt | None = None,
rankBy: ConvertibleToInt | None = None,
defaultSubtotal: _ConvertibleToBool | None = True,
sumSubtotal: _ConvertibleToBool | None = None,
countASubtotal: _ConvertibleToBool | None = None,
@@ -670,11 +670,11 @@ class Location(Serialisable):
def __init__(
self,
ref: str,
firstHeaderRow: _ConvertibleToInt,
firstDataRow: _ConvertibleToInt,
firstDataCol: _ConvertibleToInt,
rowPageCount: _ConvertibleToInt | None = None,
colPageCount: _ConvertibleToInt | None = None,
firstHeaderRow: ConvertibleToInt,
firstDataRow: ConvertibleToInt,
firstDataCol: ConvertibleToInt,
rowPageCount: ConvertibleToInt | None = None,
colPageCount: ConvertibleToInt | None = None,
) -> None: ...
class TableDefinition(Serialisable):
@@ -773,9 +773,9 @@ class TableDefinition(Serialisable):
def __init__(
self,
name: str,
cacheId: _ConvertibleToInt,
cacheId: ConvertibleToInt,
dataOnRows: _ConvertibleToBool = False,
dataPosition: _ConvertibleToInt | None = None,
dataPosition: ConvertibleToInt | None = None,
*,
dataCaption: str,
grandTotalCaption: str | None = None,
@@ -787,8 +787,8 @@ class TableDefinition(Serialisable):
pivotTableStyle: str | None = None,
vacatedStyle: str | None = None,
tag: str | None = None,
updatedVersion: _ConvertibleToInt = 0,
minRefreshableVersion: _ConvertibleToInt = 0,
updatedVersion: ConvertibleToInt = 0,
minRefreshableVersion: ConvertibleToInt = 0,
asteriskTotals: _ConvertibleToBool = False,
showItems: _ConvertibleToBool = True,
editData: _ConvertibleToBool = False,
@@ -806,7 +806,7 @@ class TableDefinition(Serialisable):
enableFieldProperties: _ConvertibleToBool = True,
preserveFormatting: _ConvertibleToBool = True,
useAutoFormatting: _ConvertibleToBool = False,
pageWrap: _ConvertibleToInt = 0,
pageWrap: ConvertibleToInt = 0,
pageOverThenDown: _ConvertibleToBool = False,
subtotalHiddenItems: _ConvertibleToBool = False,
rowGrandTotals: _ConvertibleToBool = True,
@@ -815,8 +815,8 @@ class TableDefinition(Serialisable):
itemPrintTitles: _ConvertibleToBool = False,
mergeItem: _ConvertibleToBool = False,
showDropZones: _ConvertibleToBool = True,
createdVersion: _ConvertibleToInt = 0,
indent: _ConvertibleToInt = 1,
createdVersion: ConvertibleToInt = 0,
indent: ConvertibleToInt = 1,
showEmptyRow: _ConvertibleToBool = False,
showEmptyCol: _ConvertibleToBool = False,
showHeaders: _ConvertibleToBool = True,
@@ -828,13 +828,13 @@ class TableDefinition(Serialisable):
gridDropZones: _ConvertibleToBool = False,
immersive: _ConvertibleToBool = True,
multipleFieldFilters: _ConvertibleToBool = None,
chartFormat: _ConvertibleToInt = 0,
chartFormat: ConvertibleToInt = 0,
rowHeaderCaption: str | None = None,
colHeaderCaption: str | None = None,
fieldListSortAscending: _ConvertibleToBool = None,
mdxSubqueries: _ConvertibleToBool = None,
customListSort: _ConvertibleToBool | None = None,
autoFormatId: _ConvertibleToInt | None = None,
autoFormatId: ConvertibleToInt | None = None,
applyNumberFormats: _ConvertibleToBool = False,
applyBorderFormats: _ConvertibleToBool = False,
applyFontFormats: _ConvertibleToBool = False,
@@ -864,9 +864,9 @@ class TableDefinition(Serialisable):
def __init__(
self,
name: str,
cacheId: _ConvertibleToInt,
cacheId: ConvertibleToInt,
dataOnRows: _ConvertibleToBool,
dataPosition: _ConvertibleToInt | None,
dataPosition: ConvertibleToInt | None,
dataCaption: str,
grandTotalCaption: str | None,
errorCaption: str | None,
@@ -877,8 +877,8 @@ class TableDefinition(Serialisable):
pivotTableStyle: str | None,
vacatedStyle: str | None,
tag: str | None,
updatedVersion: _ConvertibleToInt,
minRefreshableVersion: _ConvertibleToInt,
updatedVersion: ConvertibleToInt,
minRefreshableVersion: ConvertibleToInt,
asteriskTotals: _ConvertibleToBool,
showItems: _ConvertibleToBool,
editData: _ConvertibleToBool,
@@ -896,7 +896,7 @@ class TableDefinition(Serialisable):
enableFieldProperties: _ConvertibleToBool,
preserveFormatting: _ConvertibleToBool,
useAutoFormatting: _ConvertibleToBool,
pageWrap: _ConvertibleToInt,
pageWrap: ConvertibleToInt,
pageOverThenDown: _ConvertibleToBool,
subtotalHiddenItems: _ConvertibleToBool,
rowGrandTotals: _ConvertibleToBool,
@@ -905,8 +905,8 @@ class TableDefinition(Serialisable):
itemPrintTitles: _ConvertibleToBool,
mergeItem: _ConvertibleToBool,
showDropZones: _ConvertibleToBool,
createdVersion: _ConvertibleToInt,
indent: _ConvertibleToInt,
createdVersion: ConvertibleToInt,
indent: ConvertibleToInt,
showEmptyRow: _ConvertibleToBool,
showEmptyCol: _ConvertibleToBool,
showHeaders: _ConvertibleToBool,
@@ -918,13 +918,13 @@ class TableDefinition(Serialisable):
gridDropZones: _ConvertibleToBool,
immersive: _ConvertibleToBool,
multipleFieldFilters: _ConvertibleToBool,
chartFormat: _ConvertibleToInt,
chartFormat: ConvertibleToInt,
rowHeaderCaption: str | None,
colHeaderCaption: str | None,
fieldListSortAscending: _ConvertibleToBool,
mdxSubqueries: _ConvertibleToBool,
customListSort: _ConvertibleToBool | None,
autoFormatId: _ConvertibleToInt | None,
autoFormatId: ConvertibleToInt | None,
applyNumberFormats: _ConvertibleToBool,
applyBorderFormats: _ConvertibleToBool,
applyFontFormats: _ConvertibleToBool,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, Incomplete
from collections.abc import Iterator
from typing import ClassVar
from typing_extensions import Final, Literal, TypeAlias
from openpyxl.descriptors.base import Alias, Bool, Min, MinMax, NoneSet, _ConvertibleToBool, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Bool, Min, MinMax, NoneSet, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_HorizontalAlignmentsType: TypeAlias = Literal[
@@ -36,10 +36,10 @@ class Alignment(Serialisable):
textRotation: int = 0,
wrapText: _ConvertibleToBool | None = None,
shrinkToFit: _ConvertibleToBool | None = None,
indent: _ConvertibleToFloat = 0,
relativeIndent: _ConvertibleToFloat = 0,
indent: ConvertibleToFloat = 0,
relativeIndent: ConvertibleToFloat = 0,
justifyLastLine: _ConvertibleToBool | None = None,
readingOrder: _ConvertibleToFloat = 0,
readingOrder: ConvertibleToFloat = 0,
text_rotation: Incomplete | None = None,
wrap_text: Incomplete | None = None,
shrink_to_fit: Incomplete | None = None,

View File

@@ -1,11 +1,11 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from array import array
from collections.abc import Iterable
from typing import ClassVar
from typing_extensions import Literal, Self
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.alignment import Alignment
@@ -56,11 +56,11 @@ class CellStyle(Serialisable):
__attrs__: ClassVar[tuple[str, ...]]
def __init__(
self,
numFmtId: _ConvertibleToInt = 0,
fontId: _ConvertibleToInt = 0,
fillId: _ConvertibleToInt = 0,
borderId: _ConvertibleToInt = 0,
xfId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt = 0,
fontId: ConvertibleToInt = 0,
fillId: ConvertibleToInt = 0,
borderId: ConvertibleToInt = 0,
xfId: ConvertibleToInt | None = None,
quotePrefix: _ConvertibleToBool | None = None,
pivotButton: _ConvertibleToBool | None = None,
applyNumberFormat: _ConvertibleToBool | None = None,

View File

@@ -1,20 +1,11 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from collections.abc import Iterator
from re import Pattern
from typing import ClassVar, TypeVar, overload
from typing_extensions import Final, Literal, Self
from openpyxl.descriptors import Strict, Typed
from openpyxl.descriptors.base import (
_N,
Bool,
Integer,
MinMax,
String,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import _N, Bool, Integer, MinMax, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_S = TypeVar("_S", bound=Serialisable)
@@ -47,17 +38,17 @@ class Color(Serialisable):
def __init__(
self,
rgb="00000000",
indexed: _ConvertibleToInt | None = None,
indexed: ConvertibleToInt | None = None,
auto: _ConvertibleToBool | None = None,
theme: _ConvertibleToInt | None = None,
tint: _ConvertibleToFloat = 0.0,
index: _ConvertibleToInt | None = None,
theme: ConvertibleToInt | None = None,
tint: ConvertibleToFloat = 0.0,
index: ConvertibleToInt | None = None,
type: Unused = "rgb",
) -> None: ...
@property
def value(self) -> str | int | bool: ...
@value.setter
def value(self, value: str | _ConvertibleToInt | _ConvertibleToBool) -> None: ...
def value(self, value: str | ConvertibleToInt | _ConvertibleToBool) -> None: ...
def __iter__(self) -> Iterator[tuple[str, str]]: ...
@property
def index(self) -> str | int | bool: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, Incomplete
from collections.abc import Iterable, Iterator, Sequence as ABCSequence
from typing import ClassVar
from typing_extensions import Final, Literal, TypeAlias
from openpyxl.descriptors import Sequence, Strict
from openpyxl.descriptors.base import Alias, Float, MinMax, NoneSet, Set, _ConvertibleToFloat
from openpyxl.descriptors.base import Alias, Float, MinMax, NoneSet, Set
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.colors import Color, ColorDescriptor
@@ -85,7 +85,7 @@ class Stop(Serialisable):
tagname: ClassVar[str]
position: MinMax[float, Literal[False]]
color: Incomplete
def __init__(self, color, position: _ConvertibleToFloat) -> None: ...
def __init__(self, color, position: ConvertibleToFloat) -> None: ...
class StopList(Sequence):
expected_type: type[Incomplete]
@@ -104,11 +104,11 @@ class GradientFill(Fill):
def __init__(
self,
type: _GradientFillType = "linear",
degree: _ConvertibleToFloat = 0,
left: _ConvertibleToFloat = 0,
right: _ConvertibleToFloat = 0,
top: _ConvertibleToFloat = 0,
bottom: _ConvertibleToFloat = 0,
degree: ConvertibleToFloat = 0,
left: ConvertibleToFloat = 0,
right: ConvertibleToFloat = 0,
top: ConvertibleToFloat = 0,
bottom: ConvertibleToFloat = 0,
stop=(),
) -> None: ...
def __iter__(self) -> Iterator[tuple[str, str]]: ...

View File

@@ -1,7 +1,8 @@
from _typeshed import ConvertibleToFloat, ConvertibleToInt
from typing import ClassVar
from typing_extensions import Final, Literal, Self, TypeAlias
from openpyxl.descriptors.base import Alias, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, _ConvertibleToBool
from openpyxl.descriptors.nested import (
NestedBool,
NestedFloat,
@@ -50,16 +51,16 @@ class Font(Serialisable):
def __init__(
self,
name: object = None,
sz: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
sz: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
b: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
i: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool = None,
charset: _HasTagAndGet[_ConvertibleToInt | None] | _ConvertibleToInt | None = None,
charset: _HasTagAndGet[ConvertibleToInt | None] | ConvertibleToInt | None = None,
u: _NestedNoneSetParam[_FontU] = None,
strike: _HasTagAndGet[_ConvertibleToBool | None] | _ConvertibleToBool | None = None,
color: str | Color | None = None,
scheme: _NestedNoneSetParam[_FontScheme] = None,
family: _HasTagAndGet[_ConvertibleToFloat | None] | _ConvertibleToFloat | None = None,
size: _HasTagAndGet[_ConvertibleToFloat] | _ConvertibleToFloat | None = None,
family: _HasTagAndGet[ConvertibleToFloat | None] | ConvertibleToFloat | None = None,
size: _HasTagAndGet[ConvertibleToFloat] | ConvertibleToFloat | None = None,
bold: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool | None = None,
italic: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool | None = None,
strikethrough: _HasTagAndGet[_ConvertibleToBool] | _ConvertibleToBool | None = None,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from collections.abc import Iterator
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.alignment import Alignment
@@ -33,7 +33,7 @@ class NamedStyle(Serialisable):
alignment: Alignment | None = None,
number_format: Incomplete | None = None,
protection: Protection | None = None,
builtinId: _ConvertibleToInt | None = None,
builtinId: ConvertibleToInt | None = None,
hidden: _ConvertibleToBool | None = False,
xfId: Unused = None,
) -> None: ...
@@ -65,9 +65,9 @@ class _NamedCellStyle(Serialisable):
def __init__(
self,
name: str,
xfId: _ConvertibleToInt,
builtinId: _ConvertibleToInt | None = None,
iLevel: _ConvertibleToInt | None = None,
xfId: ConvertibleToInt,
builtinId: ConvertibleToInt | None = None,
iLevel: ConvertibleToInt | None = None,
hidden: _ConvertibleToBool | None = None,
customBuiltin: _ConvertibleToBool | None = None,
extLst: Unused = None,

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from re import Pattern
from typing import ClassVar, overload
from typing_extensions import Final, Literal, TypeGuard
from openpyxl.descriptors import Strict, String
from openpyxl.descriptors.base import Integer, _ConvertibleToInt
from openpyxl.descriptors.base import Integer
from openpyxl.descriptors.serialisable import Serialisable
BUILTIN_FORMATS: Final[dict[int, str]]
@@ -70,7 +70,7 @@ class NumberFormatDescriptor(String[Incomplete]):
class NumberFormat(Serialisable):
numFmtId: Integer[Literal[False]]
formatCode: String[Literal[False]]
def __init__(self, numFmtId: _ConvertibleToInt, formatCode: str) -> None: ...
def __init__(self, numFmtId: ConvertibleToInt, formatCode: str) -> None: ...
class NumberFormatList(Serialisable):
# Overwritten by property below

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_TableStyleElementType: TypeAlias = Literal[
@@ -42,7 +42,7 @@ class TableStyleElement(Serialisable):
size: Integer[Literal[True]]
dxfId: Integer[Literal[True]]
def __init__(
self, type: _TableStyleElementType, size: _ConvertibleToInt | None = None, dxfId: _ConvertibleToInt | None = None
self, type: _TableStyleElementType, size: ConvertibleToInt | None = None, dxfId: ConvertibleToInt | None = None
) -> None: ...
class TableStyle(Serialisable):
@@ -58,7 +58,7 @@ class TableStyle(Serialisable):
name: str,
pivot: _ConvertibleToBool | None = None,
table: _ConvertibleToBool | None = None,
count: _ConvertibleToInt | None = None,
count: ConvertibleToInt | None = None,
tableStyleElement=(),
) -> None: ...

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from collections import defaultdict
from collections.abc import Generator, Iterator
from re import Pattern
@@ -6,7 +6,7 @@ from typing import ClassVar
from typing_extensions import Final, Literal
from openpyxl.descriptors import Sequence
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.formula.tokenizer import _TokenOperandSubtypes, _TokenTypesNotOperand
@@ -40,12 +40,12 @@ class DefinedName(Serialisable):
description: str | None = None,
help: str | None = None,
statusBar: str | None = None,
localSheetId: _ConvertibleToInt | None = None,
localSheetId: ConvertibleToInt | None = None,
hidden: _ConvertibleToBool | None = None,
function: _ConvertibleToBool | None = None,
vbProcedure: _ConvertibleToBool | None = None,
xlm: _ConvertibleToBool | None = None,
functionGroupId: _ConvertibleToInt | None = None,
functionGroupId: ConvertibleToInt | None = None,
shortcutKey: str | None = None,
publishToServer: _ConvertibleToBool | None = None,
workbookParameter: _ConvertibleToBool | None = None,

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from zipfile import ZipFile
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.nested import NestedText
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.packaging.relationship import Relationship
@@ -16,21 +16,21 @@ class ExternalCell(Serialisable):
vm: Integer[Literal[True]]
v: NestedText[str, Literal[True]]
def __init__(
self, r: str, t: _ExternalCellType | Literal["none"] | None = None, vm: _ConvertibleToInt | None = None, v: object = None
self, r: str, t: _ExternalCellType | Literal["none"] | None = None, vm: ConvertibleToInt | None = None, v: object = None
) -> None: ...
class ExternalRow(Serialisable):
r: Integer[Literal[False]]
cell: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, r: _ConvertibleToInt, cell: Incomplete | None = None) -> None: ...
def __init__(self, r: ConvertibleToInt, cell: Incomplete | None = None) -> None: ...
class ExternalSheetData(Serialisable):
sheetId: Integer[Literal[False]]
refreshError: Bool[Literal[True]]
row: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, sheetId: _ConvertibleToInt, refreshError: _ConvertibleToBool | None = None, row=()) -> None: ...
def __init__(self, sheetId: ConvertibleToInt, refreshError: _ConvertibleToBool | None = None, row=()) -> None: ...
class ExternalSheetDataSet(Serialisable):
sheetData: Incomplete
@@ -47,7 +47,7 @@ class ExternalDefinedName(Serialisable):
name: String[Literal[False]]
refersTo: String[Literal[True]]
sheetId: Integer[Literal[True]]
def __init__(self, name: str, refersTo: str | None = None, sheetId: _ConvertibleToInt | None = None) -> None: ...
def __init__(self, name: str, refersTo: str | None = None, sheetId: ConvertibleToInt | None = None) -> None: ...
class ExternalBook(Serialisable):
tagname: ClassVar[str]

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Integer, String, _ConvertibleToInt
from openpyxl.descriptors.base import Integer, String
from openpyxl.descriptors.serialisable import Serialisable
class FunctionGroup(Serialisable):
@@ -15,4 +15,4 @@ class FunctionGroupList(Serialisable):
builtInGroupCount: Integer[Literal[True]]
functionGroup: Incomplete
__elements__: ClassVar[tuple[str, ...]]
def __init__(self, builtInGroupCount: _ConvertibleToInt | None = 16, functionGroup=()) -> None: ...
def __init__(self, builtInGroupCount: ConvertibleToInt | None = 16, functionGroup=()) -> None: ...

View File

@@ -1,17 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Bool,
Float,
Integer,
NoneSet,
String,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_WorkbookPropertiesShowObjects: TypeAlias = Literal["all", "placeholders"]
@@ -60,7 +51,7 @@ class WorkbookProperties(Serialisable):
checkCompatibility: _ConvertibleToBool | None = None,
autoCompressPictures: _ConvertibleToBool | None = None,
refreshAllConnections: _ConvertibleToBool | None = None,
defaultThemeVersion: _ConvertibleToInt | None = None,
defaultThemeVersion: ConvertibleToInt | None = None,
) -> None: ...
class CalcProperties(Serialisable):
@@ -80,18 +71,18 @@ class CalcProperties(Serialisable):
forceFullCalc: Bool[Literal[True]]
def __init__(
self,
calcId: _ConvertibleToInt = 124519,
calcId: ConvertibleToInt = 124519,
calcMode: _CalcPropertiesCalcMode | Literal["none"] | None = None,
fullCalcOnLoad: _ConvertibleToBool | None = True,
refMode: _CalcPropertiesRefMode | Literal["none"] | None = None,
iterate: _ConvertibleToBool | None = None,
iterateCount: _ConvertibleToInt | None = None,
iterateDelta: _ConvertibleToFloat | None = None,
iterateCount: ConvertibleToInt | None = None,
iterateDelta: ConvertibleToFloat | None = None,
fullPrecision: _ConvertibleToBool | None = None,
calcCompleted: _ConvertibleToBool | None = None,
calcOnSave: _ConvertibleToBool | None = None,
concurrentCalc: _ConvertibleToBool | None = None,
concurrentManualCount: _ConvertibleToInt | None = None,
concurrentManualCount: ConvertibleToInt | None = None,
forceFullCalc: _ConvertibleToBool | None = None,
) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal, Self
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from ..xml._functions_overloads import _SupportsIterAndAttribAndTextAndGet
@@ -40,11 +40,11 @@ class WorkbookProtection(Serialisable):
revisionsAlgorithmName: str | None = None,
revisionsHashValue: Incomplete | None = None,
revisionsSaltValue: Incomplete | None = None,
revisionsSpinCount: _ConvertibleToInt | None = None,
revisionsSpinCount: ConvertibleToInt | None = None,
workbookAlgorithmName: str | None = None,
workbookHashValue: Incomplete | None = None,
workbookSaltValue: Incomplete | None = None,
workbookSpinCount: _ConvertibleToInt | None = None,
workbookSpinCount: ConvertibleToInt | None = None,
) -> None: ...
@overload
def set_workbook_password(self, value: str = "", already_hashed: Literal[False] = False) -> None: ...
@@ -88,5 +88,5 @@ class FileSharing(Serialisable):
algorithmName: str | None = None,
hashValue: Incomplete | None = None,
saltValue: Incomplete | None = None,
spinCount: _ConvertibleToInt | None = None,
spinCount: ConvertibleToInt | None = None,
) -> None: ...

View File

@@ -1,9 +1,9 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl import _VisibilityType
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
@@ -34,13 +34,13 @@ class BookView(Serialisable):
showHorizontalScroll: _ConvertibleToBool | None = True,
showVerticalScroll: _ConvertibleToBool | None = True,
showSheetTabs: _ConvertibleToBool | None = True,
xWindow: _ConvertibleToInt | None = None,
yWindow: _ConvertibleToInt | None = None,
windowWidth: _ConvertibleToInt | None = None,
windowHeight: _ConvertibleToInt | None = None,
tabRatio: _ConvertibleToInt | None = 600,
firstSheet: _ConvertibleToInt | None = 0,
activeTab: _ConvertibleToInt | None = 0,
xWindow: ConvertibleToInt | None = None,
yWindow: ConvertibleToInt | None = None,
windowWidth: ConvertibleToInt | None = None,
windowHeight: ConvertibleToInt | None = None,
tabRatio: ConvertibleToInt | None = 600,
firstSheet: ConvertibleToInt | None = 0,
activeTab: ConvertibleToInt | None = 0,
autoFilterDateGrouping: _ConvertibleToBool | None = True,
extLst: Unused = None,
) -> None: ...
@@ -79,7 +79,7 @@ class CustomWorkbookView(Serialisable):
name: str,
guid: Incomplete | None = None,
autoUpdate: _ConvertibleToBool | None = None,
mergeInterval: _ConvertibleToInt | None = None,
mergeInterval: ConvertibleToInt | None = None,
changesSavedWin: _ConvertibleToBool | None = None,
onlySync: _ConvertibleToBool | None = None,
personalView: _ConvertibleToBool | None = None,
@@ -91,12 +91,12 @@ class CustomWorkbookView(Serialisable):
showVerticalScroll: _ConvertibleToBool | None = None,
showSheetTabs: _ConvertibleToBool | None = None,
*,
xWindow: _ConvertibleToInt,
yWindow: _ConvertibleToInt,
windowWidth: _ConvertibleToInt,
windowHeight: _ConvertibleToInt,
tabRatio: _ConvertibleToInt | None = None,
activeSheetId: _ConvertibleToInt,
xWindow: ConvertibleToInt,
yWindow: ConvertibleToInt,
windowWidth: ConvertibleToInt,
windowHeight: ConvertibleToInt,
tabRatio: ConvertibleToInt | None = None,
activeSheetId: ConvertibleToInt,
showFormulaBar: _ConvertibleToBool | None = None,
showStatusbar: _ConvertibleToBool | None = None,
showComments: _CustomWorkbookViewShowComments | Literal["none"] | None = "commIndicator",
@@ -109,7 +109,7 @@ class CustomWorkbookView(Serialisable):
name: str,
guid: Incomplete | None,
autoUpdate: _ConvertibleToBool | None,
mergeInterval: _ConvertibleToInt | None,
mergeInterval: ConvertibleToInt | None,
changesSavedWin: _ConvertibleToBool | None,
onlySync: _ConvertibleToBool | None,
personalView: _ConvertibleToBool | None,
@@ -120,12 +120,12 @@ class CustomWorkbookView(Serialisable):
showHorizontalScroll: _ConvertibleToBool | None,
showVerticalScroll: _ConvertibleToBool | None,
showSheetTabs: _ConvertibleToBool | None,
xWindow: _ConvertibleToInt,
yWindow: _ConvertibleToInt,
windowWidth: _ConvertibleToInt,
windowHeight: _ConvertibleToInt,
tabRatio: _ConvertibleToInt | None,
activeSheetId: _ConvertibleToInt,
xWindow: ConvertibleToInt,
yWindow: ConvertibleToInt,
windowWidth: ConvertibleToInt,
windowHeight: ConvertibleToInt,
tabRatio: ConvertibleToInt | None,
activeSheetId: ConvertibleToInt,
showFormulaBar: _ConvertibleToBool | None = None,
showStatusbar: _ConvertibleToBool | None = None,
showComments: _CustomWorkbookViewShowComments | Literal["none"] | None = "commIndicator",

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
_WebPublishingTargetScreenSize: TypeAlias = Literal[
@@ -30,7 +30,7 @@ class WebPublishObject(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
divId: str,
sourceObject: str | None = None,
*,
@@ -41,7 +41,7 @@ class WebPublishObject(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
divId: str,
sourceObject: str | None,
destinationFile: str,
@@ -78,7 +78,7 @@ class WebPublishing(Serialisable):
vml: _ConvertibleToBool | None = None,
allowPng: _ConvertibleToBool | None = None,
targetScreenSize: _WebPublishingTargetScreenSize | Literal["none"] | None = "800x600",
dpi: _ConvertibleToInt | None = None,
codePage: _ConvertibleToInt | None = None,
dpi: ConvertibleToInt | None = None,
codePage: ConvertibleToInt | None = None,
characterSet: str | None = None,
) -> None: ...

View File

@@ -1,11 +1,11 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from collections.abc import Generator, Iterator
from itertools import product
from typing import Any, overload
from typing_extensions import Literal
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import MinMax, _ConvertibleToInt
from openpyxl.descriptors.base import MinMax
from openpyxl.descriptors.serialisable import Serialisable
class CellRange(Serialisable):
@@ -30,10 +30,10 @@ class CellRange(Serialisable):
self,
range_string: None = None,
*,
min_col: _ConvertibleToInt,
min_row: _ConvertibleToInt,
max_col: _ConvertibleToInt,
max_row: _ConvertibleToInt,
min_col: ConvertibleToInt,
min_row: ConvertibleToInt,
max_col: ConvertibleToInt,
max_row: ConvertibleToInt,
title: str | None = None,
) -> None: ...
@property

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.ole import ObjectAnchor
@@ -53,10 +53,10 @@ class Control(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
@overload
def __init__(
self, controlPr: ControlProperty | None = None, *, shapeId: _ConvertibleToInt, name: str | None = None
self, controlPr: ControlProperty | None = None, *, shapeId: ConvertibleToInt, name: str | None = None
) -> None: ...
@overload
def __init__(self, controlPr: ControlProperty | None, shapeId: _ConvertibleToInt, name: str | None = None) -> None: ...
def __init__(self, controlPr: ControlProperty | None, shapeId: ConvertibleToInt, name: str | None = None) -> None: ...
class Controls(Serialisable):
tagname: ClassVar[str]

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, Protocol
from typing_extensions import Literal, TypeAlias
@@ -10,7 +10,6 @@ from openpyxl.descriptors.base import (
NoneSet,
String,
_ConvertibleToBool,
_ConvertibleToInt,
_ConvertibleToMultiCellRange,
)
from openpyxl.descriptors.nested import NestedText
@@ -97,8 +96,8 @@ class DataValidationList(Serialisable):
def __init__(
self,
disablePrompts: _ConvertibleToBool | None = None,
xWindow: _ConvertibleToInt | None = None,
yWindow: _ConvertibleToInt | None = None,
xWindow: ConvertibleToInt | None = None,
yWindow: ConvertibleToInt | None = None,
count: Incomplete | None = None,
dataValidation=(),
) -> None: ...

View File

@@ -1,19 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from collections.abc import Callable, Iterator
from typing import ClassVar, Generic, TypeVar
from typing_extensions import Literal, Self
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import (
Alias,
Bool,
Float,
Integer,
String,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Alias, Bool, Float, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.styles.styleable import StyleableObject
from openpyxl.utils.bound_dictionary import BoundDictionary
@@ -34,9 +25,9 @@ class Dimension(Strict, StyleableObject):
def __init__(
self,
index: _ConvertibleToInt,
index: ConvertibleToInt,
hidden: _ConvertibleToBool,
outlineLevel: _ConvertibleToInt | None,
outlineLevel: ConvertibleToInt | None,
collapsed: _ConvertibleToBool,
worksheet: Worksheet,
visible: Unused = True,
@@ -56,13 +47,13 @@ class RowDimension(Dimension):
self,
worksheet: Worksheet,
index: int = 0,
ht: _ConvertibleToFloat | None = None,
ht: ConvertibleToFloat | None = None,
customHeight: Unused = None,
s: Incomplete | None = None,
customFormat: Unused = None,
hidden: _ConvertibleToBool = None,
outlineLevel: _ConvertibleToInt | None = 0,
outline_level: _ConvertibleToInt | None = None,
outlineLevel: ConvertibleToInt | None = 0,
outline_level: ConvertibleToInt | None = None,
collapsed: _ConvertibleToBool = None,
visible: Incomplete | None = None,
height: Incomplete | None = None,
@@ -90,15 +81,15 @@ class ColumnDimension(Dimension):
self,
worksheet: Worksheet,
index: str = "A",
width: _ConvertibleToFloat = 13,
width: ConvertibleToFloat = 13,
bestFit: _ConvertibleToBool = False,
hidden: _ConvertibleToBool = False,
outlineLevel: _ConvertibleToInt | None = 0,
outline_level: _ConvertibleToInt | None = None,
outlineLevel: ConvertibleToInt | None = 0,
outline_level: ConvertibleToInt | None = None,
collapsed: _ConvertibleToBool = False,
style: Incomplete | None = None,
min: _ConvertibleToInt | None = None,
max: _ConvertibleToInt | None = None,
min: ConvertibleToInt | None = None,
max: ConvertibleToInt | None = None,
customWidth: Unused = False,
visible: bool | None = None,
auto_size: _ConvertibleToBool | None = None,
@@ -132,15 +123,15 @@ class SheetFormatProperties(Serialisable):
outlineLevelCol: Integer[Literal[True]]
def __init__(
self,
baseColWidth: _ConvertibleToInt | None = 8,
defaultColWidth: _ConvertibleToFloat | None = None,
defaultRowHeight: _ConvertibleToFloat = 15,
baseColWidth: ConvertibleToInt | None = 8,
defaultColWidth: ConvertibleToFloat | None = None,
defaultRowHeight: ConvertibleToFloat = 15,
customHeight: _ConvertibleToBool | None = None,
zeroHeight: _ConvertibleToBool | None = None,
thickTop: _ConvertibleToBool | None = None,
thickBottom: _ConvertibleToBool | None = None,
outlineLevelRow: _ConvertibleToInt | None = None,
outlineLevelCol: _ConvertibleToInt | None = None,
outlineLevelRow: ConvertibleToInt | None = None,
outlineLevelCol: ConvertibleToInt | None = None,
) -> None: ...
class SheetDimension(Serialisable):

View File

@@ -1,4 +1,4 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from datetime import datetime
from re import Pattern
from typing import ClassVar, overload
@@ -18,8 +18,6 @@ from openpyxl.descriptors.base import (
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
@@ -119,9 +117,9 @@ class SortCondition(Serialisable):
descending: _ConvertibleToBool | None = None,
sortBy: _SortConditionSortBy | Literal["none"] | None = None,
customList: str | None = None,
dxfId: _ConvertibleToInt | None = None,
dxfId: ConvertibleToInt | None = None,
iconSet: _IconSet | Literal["none"] | None = None,
iconId: _ConvertibleToInt | None = None,
iconId: ConvertibleToInt | None = None,
) -> None: ...
class SortState(Serialisable):
@@ -148,13 +146,13 @@ class IconFilter(Serialisable):
tagname: ClassVar[str]
iconSet: Set[_IconSet]
iconId: Integer[Literal[True]]
def __init__(self, iconSet: _IconSet, iconId: _ConvertibleToInt | None = None) -> None: ...
def __init__(self, iconSet: _IconSet, iconId: ConvertibleToInt | None = None) -> None: ...
class ColorFilter(Serialisable):
tagname: ClassVar[str]
dxfId: Integer[Literal[True]]
cellColor: Bool[Literal[True]]
def __init__(self, dxfId: _ConvertibleToInt | None = None, cellColor: _ConvertibleToBool | None = None) -> None: ...
def __init__(self, dxfId: ConvertibleToInt | None = None, cellColor: _ConvertibleToBool | None = None) -> None: ...
class DynamicFilter(Serialisable):
tagname: ClassVar[str]
@@ -166,9 +164,9 @@ class DynamicFilter(Serialisable):
def __init__(
self,
type: _DynamicFilterType,
val: _ConvertibleToFloat | None = None,
val: ConvertibleToFloat | None = None,
valIso: datetime | str | None = None,
maxVal: _ConvertibleToFloat | None = None,
maxVal: ConvertibleToFloat | None = None,
maxValIso: datetime | str | None = None,
) -> None: ...
@@ -177,11 +175,11 @@ class CustomFilterValueDescriptor(Convertible[float | str, _N]):
expected_type: type[float | str]
@overload # type:ignore[override] # Different restrictions
def __set__(
self: CustomFilterValueDescriptor[Literal[True]], instance: Serialisable | Strict, value: str | _ConvertibleToFloat | None
self: CustomFilterValueDescriptor[Literal[True]], instance: Serialisable | Strict, value: str | ConvertibleToFloat | None
) -> None: ...
@overload
def __set__(
self: CustomFilterValueDescriptor[Literal[False]], instance: Serialisable | Strict, value: str | _ConvertibleToFloat
self: CustomFilterValueDescriptor[Literal[False]], instance: Serialisable | Strict, value: str | ConvertibleToFloat
) -> None: ...
class CustomFilter(Serialisable):
@@ -211,16 +209,16 @@ class Top10(Serialisable):
top: _ConvertibleToBool | None = None,
percent: _ConvertibleToBool | None = None,
*,
val: _ConvertibleToFloat,
filterVal: _ConvertibleToFloat | None = None,
val: ConvertibleToFloat,
filterVal: ConvertibleToFloat | None = None,
) -> None: ...
@overload
def __init__(
self,
top: _ConvertibleToBool | None,
percent: _ConvertibleToBool | None,
val: _ConvertibleToFloat,
filterVal: _ConvertibleToFloat | None = None,
val: ConvertibleToFloat,
filterVal: ConvertibleToFloat | None = None,
) -> None: ...
class DateGroupItem(Serialisable):
@@ -235,24 +233,24 @@ class DateGroupItem(Serialisable):
@overload
def __init__(
self,
year: _ConvertibleToInt,
month: _ConvertibleToFloat | None = None,
day: _ConvertibleToFloat | None = None,
hour: _ConvertibleToFloat | None = None,
minute: _ConvertibleToFloat | None = None,
second: _ConvertibleToInt | None = None,
year: ConvertibleToInt,
month: ConvertibleToFloat | None = None,
day: ConvertibleToFloat | None = None,
hour: ConvertibleToFloat | None = None,
minute: ConvertibleToFloat | None = None,
second: ConvertibleToInt | None = None,
*,
dateTimeGrouping: _DateGroupItemDateTimeGrouping,
) -> None: ...
@overload
def __init__(
self,
year: _ConvertibleToInt,
month: _ConvertibleToFloat | None,
day: _ConvertibleToFloat | None,
hour: _ConvertibleToFloat | None,
minute: _ConvertibleToFloat | None,
second: _ConvertibleToInt | None,
year: ConvertibleToInt,
month: ConvertibleToFloat | None,
day: ConvertibleToFloat | None,
hour: ConvertibleToFloat | None,
minute: ConvertibleToFloat | None,
second: ConvertibleToInt | None,
dateTimeGrouping: _DateGroupItemDateTimeGrouping,
) -> None: ...
@@ -287,7 +285,7 @@ class FilterColumn(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
colId: _ConvertibleToInt,
colId: ConvertibleToInt,
hiddenButton: _ConvertibleToBool | None = False,
showButton: _ConvertibleToBool | None = True,
filters: Filters | None = None,

View File

@@ -1,9 +1,10 @@
from _typeshed import ConvertibleToInt
from re import Pattern
from typing import ClassVar
from typing_extensions import Final, Literal, Self
from openpyxl.descriptors import Strict
from openpyxl.descriptors.base import Alias, Bool, Integer, MatchPattern, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, MatchPattern, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from ..xml._functions_overloads import _HasText
@@ -20,7 +21,7 @@ class _HeaderFooterPart(Strict):
RGB: ClassVar[str]
color: MatchPattern[str, Literal[True]]
def __init__(
self, text: str | None = None, font: str | None = None, size: _ConvertibleToInt | None = None, color: str | None = None
self, text: str | None = None, font: str | None = None, size: ConvertibleToInt | None = None, color: str | None = None
) -> None: ...
def __bool__(self) -> bool: ...
@classmethod

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import Bool, Integer, Set, String, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.drawing.spreadsheet_drawing import AnchorMarker
@@ -22,7 +22,7 @@ class ObjectAnchor(Serialisable):
to: AnchorMarker,
moveWithCells: _ConvertibleToBool | None = False,
sizeWithCells: _ConvertibleToBool | None = False,
z_order: _ConvertibleToInt | None = None,
z_order: ConvertibleToInt | None = None,
) -> None: ...
class ObjectPr(Serialisable):
@@ -94,7 +94,7 @@ class OleObject(Serialisable):
*,
oleUpdate: _OleObjectOleUpdate,
autoLoad: _ConvertibleToBool | None = False,
shapeId: _ConvertibleToInt,
shapeId: ConvertibleToInt,
) -> None: ...
@overload
def __init__(
@@ -105,7 +105,7 @@ class OleObject(Serialisable):
link: str | None,
oleUpdate: _OleObjectOleUpdate,
autoLoad: _ConvertibleToBool | None,
shapeId: _ConvertibleToInt,
shapeId: ConvertibleToInt,
) -> None: ...
class OleObjects(Serialisable):

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
from typing import ClassVar
from typing_extensions import Literal, Self, TypeAlias
from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, _ConvertibleToBool, _ConvertibleToFloat, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable, _ChildSerialisableTreeElement
from openpyxl.worksheet.properties import PageSetupProperties
@@ -36,11 +36,11 @@ class PrintPageSetup(Serialisable):
self,
worksheet: Incomplete | None = None,
orientation: _PrintPageSetupOrientation | Literal["none"] | None = None,
paperSize: _ConvertibleToInt | None = None,
scale: _ConvertibleToInt | None = None,
fitToHeight: _ConvertibleToInt | None = None,
fitToWidth: _ConvertibleToInt | None = None,
firstPageNumber: _ConvertibleToInt | None = None,
paperSize: ConvertibleToInt | None = None,
scale: ConvertibleToInt | None = None,
fitToHeight: ConvertibleToInt | None = None,
fitToWidth: ConvertibleToInt | None = None,
firstPageNumber: ConvertibleToInt | None = None,
useFirstPageNumber: _ConvertibleToBool | None = None,
paperHeight: Incomplete | None = None,
paperWidth: Incomplete | None = None,
@@ -50,9 +50,9 @@ class PrintPageSetup(Serialisable):
draft: _ConvertibleToBool | None = None,
cellComments: _PrintPageSetupCellComments | Literal["none"] | None = None,
errors: _PrintPageSetupErrors | Literal["none"] | None = None,
horizontalDpi: _ConvertibleToInt | None = None,
verticalDpi: _ConvertibleToInt | None = None,
copies: _ConvertibleToInt | None = None,
horizontalDpi: ConvertibleToInt | None = None,
verticalDpi: ConvertibleToInt | None = None,
copies: ConvertibleToInt | None = None,
id: Incomplete | None = None,
) -> None: ...
def __bool__(self) -> bool: ...
@@ -96,10 +96,10 @@ class PageMargins(Serialisable):
footer: Float[Literal[False]]
def __init__(
self,
left: _ConvertibleToFloat = 0.75,
right: _ConvertibleToFloat = 0.75,
top: _ConvertibleToFloat = 1,
bottom: _ConvertibleToFloat = 1,
header: _ConvertibleToFloat = 0.5,
footer: _ConvertibleToFloat = 0.5,
left: ConvertibleToFloat = 0.75,
right: ConvertibleToFloat = 0.75,
top: ConvertibleToFloat = 1,
bottom: ConvertibleToFloat = 1,
header: ConvertibleToFloat = 0.5,
footer: ConvertibleToFloat = 0.5,
) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
class Break(Serialisable):
@@ -14,9 +14,9 @@ class Break(Serialisable):
pt: Bool[Literal[True]]
def __init__(
self,
id: _ConvertibleToInt | None = 0,
min: _ConvertibleToInt | None = 0,
max: _ConvertibleToInt | None = 16383,
id: ConvertibleToInt | None = 0,
min: ConvertibleToInt | None = 0,
max: ConvertibleToInt | None = 16383,
man: _ConvertibleToBool | None = True,
pt: _ConvertibleToBool | None = None,
) -> None: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from re import Pattern
from typing import overload
from typing_extensions import Final, Literal, Self
from openpyxl.descriptors import Integer, Strict, String
from openpyxl.descriptors.base import Typed, _ConvertibleToInt
from openpyxl.descriptors.base import Typed
from openpyxl.utils.cell import SHEETRANGE_RE as SHEETRANGE_RE
from .cell_range import MultiCellRange
@@ -29,7 +29,7 @@ class RowRange(Strict):
min_row: Integer[Literal[False]]
max_row: Integer[Literal[False]]
@overload
def __init__(self, range_string: None, min_row: _ConvertibleToInt, max_row: _ConvertibleToInt) -> None: ...
def __init__(self, range_string: None, min_row: ConvertibleToInt, max_row: ConvertibleToInt) -> None: ...
@overload
def __init__(self, range_string: Incomplete, min_row: Unused = None, max_row: Unused = None) -> None: ...
def __eq__(self, other: object) -> bool: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
class _Protected:
@@ -63,7 +63,7 @@ class SheetProtection(Serialisable, _Protected):
password: Incomplete | None = None,
algorithmName: str | None = None,
saltValue: Incomplete | None = None,
spinCount: _ConvertibleToInt | None = None,
spinCount: ConvertibleToInt | None = None,
hashValue: Incomplete | None = None,
) -> None: ...
@overload

View File

@@ -1,16 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.descriptors.base import (
Bool,
Convertible,
Integer,
String,
_ConvertibleToBool,
_ConvertibleToInt,
_ConvertibleToMultiCellRange,
)
from openpyxl.descriptors.base import Bool, Convertible, Integer, String, _ConvertibleToBool, _ConvertibleToMultiCellRange
from openpyxl.descriptors.serialisable import Serialisable
from openpyxl.worksheet.cell_range import MultiCellRange
@@ -30,7 +22,7 @@ class InputCells(Serialisable):
undone: _ConvertibleToBool | None = False,
*,
val: str,
numFmtId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt | None = None,
) -> None: ...
@overload
def __init__(
@@ -39,7 +31,7 @@ class InputCells(Serialisable):
deleted: _ConvertibleToBool | None,
undone: _ConvertibleToBool | None,
val: str,
numFmtId: _ConvertibleToInt | None = None,
numFmtId: ConvertibleToInt | None = None,
) -> None: ...
class Scenario(Serialisable):
@@ -88,8 +80,8 @@ class ScenarioList(Serialisable):
def __init__(
self,
scenario=(),
current: _ConvertibleToInt | None = None,
show: _ConvertibleToInt | None = None,
current: ConvertibleToInt | None = None,
show: ConvertibleToInt | None = None,
sqref: _ConvertibleToMultiCellRange | None = None,
) -> None: ...
def append(self, scenario) -> None: ...

View File

@@ -1,8 +1,8 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from typing import ClassVar, overload
from typing_extensions import Literal
from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool
from openpyxl.descriptors.serialisable import Serialisable
class CellSmartTagPr(Serialisable):
@@ -23,7 +23,7 @@ class CellSmartTag(Serialisable):
self,
cellSmartTagPr=(),
*,
type: _ConvertibleToInt,
type: ConvertibleToInt,
deleted: _ConvertibleToBool | None = False,
xmlBased: _ConvertibleToBool | None = False,
) -> None: ...
@@ -31,7 +31,7 @@ class CellSmartTag(Serialisable):
def __init__(
self,
cellSmartTagPr,
type: _ConvertibleToInt,
type: ConvertibleToInt,
deleted: _ConvertibleToBool | None = False,
xmlBased: _ConvertibleToBool | None = False,
) -> None: ...

View File

@@ -1,10 +1,10 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToInt, Incomplete, Unused
from collections.abc import Iterator
from typing import ClassVar, overload
from typing_extensions import Final, Literal, Self, TypeAlias
from openpyxl.descriptors import Strict, String
from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, Typed, _ConvertibleToBool, _ConvertibleToInt
from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable, _ChildSerialisableTreeElement
from openpyxl.worksheet.filters import AutoFilter, SortState
@@ -44,7 +44,7 @@ class XMLColumnProps(Serialisable):
@overload
def __init__(
self,
mapId: _ConvertibleToInt,
mapId: ConvertibleToInt,
xpath: str,
denormalized: _ConvertibleToBool | None = None,
*,
@@ -54,7 +54,7 @@ class XMLColumnProps(Serialisable):
@overload
def __init__(
self,
mapId: _ConvertibleToInt,
mapId: ConvertibleToInt,
xpath: str,
denormalized: _ConvertibleToBool | None,
xmlDataType: str,
@@ -90,16 +90,16 @@ class TableColumn(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
uniqueName: str | None = None,
*,
name: str,
totalsRowFunction: _TableColumnTotalsRowFunction | Literal["none"] | None = None,
totalsRowLabel: str | None = None,
queryTableFieldId: _ConvertibleToInt | None = None,
headerRowDxfId: _ConvertibleToInt | None = None,
dataDxfId: _ConvertibleToInt | None = None,
totalsRowDxfId: _ConvertibleToInt | None = None,
queryTableFieldId: ConvertibleToInt | None = None,
headerRowDxfId: ConvertibleToInt | None = None,
dataDxfId: ConvertibleToInt | None = None,
totalsRowDxfId: ConvertibleToInt | None = None,
headerRowCellStyle: str | None = None,
dataCellStyle: str | None = None,
totalsRowCellStyle: str | None = None,
@@ -111,15 +111,15 @@ class TableColumn(Serialisable):
@overload
def __init__(
self,
id: _ConvertibleToInt,
id: ConvertibleToInt,
uniqueName: str | None,
name: str,
totalsRowFunction: _TableColumnTotalsRowFunction | Literal["none"] | None = None,
totalsRowLabel: str | None = None,
queryTableFieldId: _ConvertibleToInt | None = None,
headerRowDxfId: _ConvertibleToInt | None = None,
dataDxfId: _ConvertibleToInt | None = None,
totalsRowDxfId: _ConvertibleToInt | None = None,
queryTableFieldId: ConvertibleToInt | None = None,
headerRowDxfId: ConvertibleToInt | None = None,
dataDxfId: ConvertibleToInt | None = None,
totalsRowDxfId: ConvertibleToInt | None = None,
headerRowCellStyle: str | None = None,
dataCellStyle: str | None = None,
totalsRowCellStyle: str | None = None,
@@ -168,28 +168,28 @@ class Table(Serialisable):
__elements__: ClassVar[tuple[str, ...]]
def __init__(
self,
id: _ConvertibleToInt = 1,
id: ConvertibleToInt = 1,
displayName: Incomplete | None = None,
ref: Incomplete | None = None,
name: str | None = None,
comment: str | None = None,
tableType: _TableTableType | Literal["none"] | None = None,
headerRowCount: _ConvertibleToInt | None = 1,
headerRowCount: ConvertibleToInt | None = 1,
insertRow: _ConvertibleToBool | None = None,
insertRowShift: _ConvertibleToBool | None = None,
totalsRowCount: _ConvertibleToInt | None = None,
totalsRowCount: ConvertibleToInt | None = None,
totalsRowShown: _ConvertibleToBool | None = None,
published: _ConvertibleToBool | None = None,
headerRowDxfId: _ConvertibleToInt | None = None,
dataDxfId: _ConvertibleToInt | None = None,
totalsRowDxfId: _ConvertibleToInt | None = None,
headerRowBorderDxfId: _ConvertibleToInt | None = None,
tableBorderDxfId: _ConvertibleToInt | None = None,
totalsRowBorderDxfId: _ConvertibleToInt | None = None,
headerRowDxfId: ConvertibleToInt | None = None,
dataDxfId: ConvertibleToInt | None = None,
totalsRowDxfId: ConvertibleToInt | None = None,
headerRowBorderDxfId: ConvertibleToInt | None = None,
tableBorderDxfId: ConvertibleToInt | None = None,
totalsRowBorderDxfId: ConvertibleToInt | None = None,
headerRowCellStyle: str | None = None,
dataCellStyle: str | None = None,
totalsRowCellStyle: str | None = None,
connectionId: _ConvertibleToInt | None = None,
connectionId: ConvertibleToInt | None = None,
autoFilter: AutoFilter | None = None,
sortState: SortState | None = None,
tableColumns=(),

View File

@@ -1,19 +1,8 @@
from _typeshed import Incomplete, Unused
from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
from typing import ClassVar
from typing_extensions import Literal, TypeAlias
from openpyxl.descriptors.base import (
Bool,
Float,
Integer,
NoneSet,
Set,
String,
Typed,
_ConvertibleToBool,
_ConvertibleToFloat,
_ConvertibleToInt,
)
from openpyxl.descriptors.base import Bool, Float, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool
from openpyxl.descriptors.excel import ExtensionList
from openpyxl.descriptors.serialisable import Serialisable
@@ -29,8 +18,8 @@ class Pane(Serialisable):
state: Set[_PaneState]
def __init__(
self,
xSplit: _ConvertibleToFloat | None = None,
ySplit: _ConvertibleToFloat | None = None,
xSplit: ConvertibleToFloat | None = None,
ySplit: ConvertibleToFloat | None = None,
topLeftCell: str | None = None,
activePane: _Pane = "topLeft",
state: _PaneState = "split",
@@ -45,7 +34,7 @@ class Selection(Serialisable):
self,
pane: _Pane | Literal["none"] | None = None,
activeCell: str | None = "A1",
activeCellId: _ConvertibleToInt | None = None,
activeCellId: ConvertibleToInt | None = None,
sqref: str | None = "A1",
) -> None: ...
@@ -88,13 +77,13 @@ class SheetView(Serialisable):
showWhiteSpace: _ConvertibleToBool | None = None,
view: _SheetViewView | Literal["none"] | None = None,
topLeftCell: str | None = None,
colorId: _ConvertibleToInt | None = None,
zoomScale: _ConvertibleToInt | None = None,
zoomScaleNormal: _ConvertibleToInt | None = None,
zoomScaleSheetLayoutView: _ConvertibleToInt | None = None,
zoomScalePageLayoutView: _ConvertibleToInt | None = None,
colorId: ConvertibleToInt | None = None,
zoomScale: ConvertibleToInt | None = None,
zoomScaleNormal: ConvertibleToInt | None = None,
zoomScaleSheetLayoutView: ConvertibleToInt | None = None,
zoomScalePageLayoutView: ConvertibleToInt | None = None,
zoomToFit: _ConvertibleToBool | None = None,
workbookViewId: _ConvertibleToInt | None = 0,
workbookViewId: ConvertibleToInt | None = 0,
selection: Incomplete | None = None,
pane: Pane | None = None,
) -> None: ...

View File

@@ -1,14 +1,13 @@
import datetime as dt
from _typeshed import Incomplete, ReadableBuffer, SupportsRead, SupportsReadline, SupportsTrunc, SupportsWrite, Unused
from _typeshed import ConvertibleToInt, Incomplete, SupportsRead, SupportsReadline, SupportsWrite, Unused
from collections.abc import Callable, Iterable, Mapping, Sequence
from types import TracebackType
from typing import Any, NoReturn, Protocol, SupportsInt, TypeVar, overload, type_check_only
from typing_extensions import Literal, Self, SupportsIndex, TypeAlias
from typing import Any, NoReturn, Protocol, TypeVar, overload, type_check_only
from typing_extensions import Literal, Self, TypeAlias
from psycopg2.sql import Composable
_Vars: TypeAlias = Sequence[Any] | Mapping[str, Any] | None
_AcceptedByInt: TypeAlias = str | ReadableBuffer | SupportsInt | SupportsIndex | SupportsTrunc
@type_check_only
class _type:
@@ -321,7 +320,7 @@ class Float:
def __conform__(self, __proto) -> Self | None: ...
class Int:
def __init__(self, __value: _AcceptedByInt, **kwargs: Unused) -> None: ...
def __init__(self, __value: ConvertibleToInt, **kwargs: Unused) -> None: ...
@property
def adapted(self) -> Any: ...
def getquoted(self) -> bytes: ...

View File

@@ -1,8 +1,7 @@
from _typeshed import Incomplete
from _typeshed import ConvertibleToInt, Incomplete
from collections.abc import Hashable
import psycopg2
from psycopg2._psycopg import _AcceptedByInt
class PoolError(psycopg2.Error): ...
@@ -10,7 +9,7 @@ class AbstractConnectionPool:
minconn: int
maxconn: int
closed: bool
def __init__(self, minconn: _AcceptedByInt, maxconn: _AcceptedByInt, *args, **kwargs) -> None: ...
def __init__(self, minconn: ConvertibleToInt, maxconn: ConvertibleToInt, *args, **kwargs) -> None: ...
# getconn, putconn and closeall are officially documented as methods of the
# abstract base class, but in reality, they only exist on the children classes
def getconn(self, key: Hashable | None = None) -> Incomplete: ...

View File

@@ -1,7 +1,6 @@
from _typeshed import Incomplete, ReadableBuffer, SupportsRichComparison, SupportsTrunc
from _typeshed import ConvertibleToInt, Incomplete, SupportsRichComparison
from collections.abc import Callable, Generator
from typing import SupportsInt
from typing_extensions import Self, SupportsIndex, TypeAlias
from typing_extensions import Self
from pyasn1.type import base, constraint, namedtype, namedval
from pyasn1.type.tag import TagSet
@@ -26,7 +25,6 @@ __all__ = [
"NoValue",
"noValue",
]
_SizedIntegerable: TypeAlias = ReadableBuffer | str | SupportsInt | SupportsIndex | SupportsTrunc
NoValue = base.NoValue
noValue: NoValue
@@ -129,11 +127,11 @@ class BitString(base.SimpleAsn1Type):
def asInteger(self): ...
def asBinary(self): ...
@classmethod
def fromHexString(cls, value, internalFormat: bool = False, prepend: _SizedIntegerable | None = None): ...
def fromHexString(cls, value, internalFormat: bool = False, prepend: ConvertibleToInt | None = None): ...
@classmethod
def fromBinaryString(cls, value, internalFormat: bool = False, prepend: _SizedIntegerable | None = None): ...
def fromBinaryString(cls, value, internalFormat: bool = False, prepend: ConvertibleToInt | None = None): ...
@classmethod
def fromOctetString(cls, value, internalFormat: bool = False, prepend: _SizedIntegerable | None = None, padding: int = 0): ...
def fromOctetString(cls, value, internalFormat: bool = False, prepend: ConvertibleToInt | None = None, padding: int = 0): ...
def prettyIn(self, value): ...
class OctetString(base.SimpleAsn1Type):

View File

@@ -1,7 +1,7 @@
from _typeshed import ReadableBuffer, SliceableBuffer
from _typeshed import ConvertibleToFloat, SliceableBuffer
from collections.abc import Iterable, Sequence
from typing import SupportsFloat, TypeVar
from typing_extensions import Final, SupportsIndex, TypeAlias
from typing import TypeVar
from typing_extensions import Final
from Xlib._typing import Unused
from Xlib.display import Display
@@ -9,7 +9,6 @@ from Xlib.protocol import display, request, rq
from Xlib.xobject import drawable, resource
_T = TypeVar("_T")
_Floatable: TypeAlias = SupportsFloat | SupportsIndex | str | ReadableBuffer
extname: Final = "XInputExtension"
PropertyDeleted: Final = 0
@@ -119,12 +118,12 @@ PROPERTY_TYPE_FLOAT: Final = "FLOAT"
# ignore[override] because of Liskov substitution principle violations
class FP1616(rq.Int32):
def check_value(self, value: float) -> int: ... # type: ignore[override]
def parse_value(self, value: _Floatable, display: Unused) -> float: ... # type: ignore[override]
def parse_value(self, value: ConvertibleToFloat, display: Unused) -> float: ... # type: ignore[override]
class FP3232(rq.ValueField):
structcode: str
def check_value(self, value: _T) -> _T: ... # type: ignore[override]
def parse_value(self, value: tuple[_Floatable, _Floatable], display: Unused) -> float: ... # type: ignore[override]
def parse_value(self, value: tuple[ConvertibleToFloat, ConvertibleToFloat], display: Unused) -> float: ... # type: ignore[override]
class XIQueryVersion(rq.ReplyRequest): ...

View File

@@ -1,10 +1,10 @@
from _typeshed import ReadableBuffer, SliceableBuffer, SupportsTrunc
from _typeshed import ConvertibleToInt, SliceableBuffer
from array import array
# Avoid name collision with List.type
from builtins import type as Type
from collections.abc import Callable, Iterable, Sequence
from typing import Any, SupportsInt, TypeVar, overload, type_check_only
from typing import Any, TypeVar, overload, type_check_only
from typing_extensions import Final, Literal, LiteralString, SupportsIndex, TypeAlias
from Xlib._typing import ErrorHandler, Unused
@@ -14,7 +14,6 @@ from Xlib.ext.xinput import ClassInfoClass
from Xlib.protocol import display
_T = TypeVar("_T")
_IntNew: TypeAlias = str | ReadableBuffer | SupportsInt | SupportsIndex | SupportsTrunc
_ModifierMappingList8Elements: TypeAlias = Sequence[Sequence[int]]
def decode_string(bs: bytes | bytearray) -> str: ...
@@ -237,7 +236,7 @@ class Object(ValueField):
class PropertyData(ValueField):
structcode: None
def parse_binary_value(
self, data: SliceableBuffer, display: Unused, length: _IntNew | None, format: int
self, data: SliceableBuffer, display: Unused, length: ConvertibleToInt | None, format: int
) -> tuple[tuple[int, SliceableBuffer] | None, SliceableBuffer]: ...
def pack_value( # type: ignore[override] # Override Callable
self, value: tuple[int, Sequence[float] | Sequence[str]]