Direct Union replacements for ConvertibleToInt/ConvertibleToFloat

stubs/PyScreeze/pyscreeze/__init__.pyi

@@ -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

stubs/libsass/sass.pyi

@@ -1,16 +1,15 @@
 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")
 _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):

stubs/openpyxl/openpyxl/cell/text.pyi

@@ -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,

stubs/openpyxl/openpyxl/chart/_3d.pyi

@@ -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,

stubs/openpyxl/openpyxl/chart/_chart.pyi

@@ -1,19 +1,19 @@
-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.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(): ...
 

stubs/openpyxl/openpyxl/chart/axis.pyi

@@ -1,12 +1,12 @@
-from _typeshed import Incomplete, Unused
+from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
 from typing import ClassVar, overload
 from typing_extensions import Literal, Self, TypeAlias
 
 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: ...

stubs/openpyxl/openpyxl/chart/bubble_chart.pyi

@@ -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,