Update typing_extensions imports in third-party stubs (#11245)

stubs/openpyxl/@tests/test_cases/check_base_descriptors.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 from _typeshed import ReadableBuffer
 from datetime import date, datetime, time
-from typing import Any, List, Tuple, Union
-from typing_extensions import Literal, assert_type
+from typing import Any, List, Literal, Tuple, Union
+from typing_extensions import assert_type
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.base import (

stubs/openpyxl/@tests/test_cases/check_nested_descriptors.py

@@ -4,8 +4,8 @@
 # These tests are essentially a mirror of check_base_descriptors
 from __future__ import annotations
 
-from typing import Union, cast
-from typing_extensions import Literal, assert_type
+from typing import Literal, Union, cast
+from typing_extensions import assert_type
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.nested import (

stubs/openpyxl/openpyxl/__init__.pyi

@@ -1,6 +1,6 @@
 from _typeshed import StrPath, SupportsRead
-from typing import IO, Protocol
-from typing_extensions import Literal, TypeAlias
+from typing import IO, Literal, Protocol
+from typing_extensions import TypeAlias
 
 from openpyxl.compat.numbers import NUMPY as NUMPY
 from openpyxl.reader.excel import load_workbook as load_workbook

stubs/openpyxl/openpyxl/cell/cell.pyi

@@ -1,8 +1,7 @@
 from _typeshed import ReadableBuffer
 from datetime import datetime
 from re import Pattern
-from typing import overload
-from typing_extensions import Final, Literal
+from typing import Final, Literal, overload
 
 from openpyxl.cell import _CellValue, _TimeTypes
 from openpyxl.comments.comments import Comment

stubs/openpyxl/openpyxl/cell/read_only.pyi

@@ -1,5 +1,5 @@
 from _typeshed import Incomplete
-from typing_extensions import Final
+from typing import Final
 
 from openpyxl.cell import _CellValue
 from openpyxl.styles.alignment import Alignment

stubs/openpyxl/openpyxl/cell/rich_text.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
-from typing import overload
-from typing_extensions import Literal, Self
+from typing import Literal, overload
+from typing_extensions import Self
 
 from openpyxl.cell.text import InlineFont
 from openpyxl.descriptors import Strict, String, Typed

stubs/openpyxl/openpyxl/cell/text.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Integer, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.nested import NestedString, NestedText, _NestedNoneSetParam

stubs/openpyxl/openpyxl/chart/_3d.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.picture import PictureOptions
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.layout import Layout
 from openpyxl.chart.legend import Legend

stubs/openpyxl/openpyxl/chart/area_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import ChartLines, NumericAxis, SeriesAxis, TextAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/axis.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, Self, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import Self, TypeAlias
 
 from openpyxl.chart.layout import Layout
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/bar_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import ChartLines, NumericAxis, SeriesAxis, TextAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/bubble_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import NumericAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/chartspace.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.chart._3d import Surface, View3D
 from openpyxl.chart.legend import Legend

stubs/openpyxl/openpyxl/chart/data_source.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar, NoReturn, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, NoReturn, overload
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.base import Alias, Bool, Integer, String, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/chart/descriptors.pyi

@@ -1,4 +1,4 @@
-from typing_extensions import Literal
+from typing import Literal
 
 from openpyxl.chart.data_source import NumFmt
 from openpyxl.descriptors import Strict, Typed

stubs/openpyxl/openpyxl/chart/error_bar.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.data_source import NumDataSource
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/label.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.shapes import GraphicalProperties
 from openpyxl.chart.text import RichText

stubs/openpyxl/openpyxl/chart/layout.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Typed
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/chart/legend.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.layout import Layout
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/line_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import ChartLines, NumericAxis, _BaseAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/marker.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.picture import PictureOptions
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/picture.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import _ConvertibleToBool
 from openpyxl.descriptors.nested import NestedBool, NestedFloat, NestedNoneSet, _NestedNoneSetParam

stubs/openpyxl/openpyxl/chart/pie_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import ChartLines
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/pivot.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, overload
 
 from openpyxl.chart.label import DataLabel as _DataLabel
 from openpyxl.chart.marker import Marker

stubs/openpyxl/openpyxl/chart/plotarea.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, Self
+from typing import ClassVar, Literal
+from typing_extensions import Self
 
 from openpyxl.chart.layout import Layout
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/print_settings.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToFloat
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Alias, Float, Typed
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/chart/radar_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import NumericAxis, TextAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/reference.pyi

@@ -1,7 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
 from collections.abc import Generator
-from typing import overload
-from typing_extensions import Literal
+from typing import Literal, overload
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.base import MinMax, String

stubs/openpyxl/openpyxl/chart/scatter_chart.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.axis import NumericAxis, TextAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/series.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.data_source import AxDataSource, NumDataSource, StrRef
 from openpyxl.chart.error_bar import ErrorBars

stubs/openpyxl/openpyxl/chart/shapes.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.nested import EmptyTag

stubs/openpyxl/openpyxl/chart/stock_chart.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.axis import ChartLines, NumericAxis, TextAxis
 from openpyxl.chart.label import DataLabelList

stubs/openpyxl/openpyxl/chart/surface_chart.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.axis import NumericAxis, SeriesAxis, TextAxis
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/text.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.data_source import StrRef
 from openpyxl.descriptors.base import Alias, Typed

stubs/openpyxl/openpyxl/chart/title.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.layout import Layout
 from openpyxl.chart.shapes import GraphicalProperties

stubs/openpyxl/openpyxl/chart/trendline.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.chart.data_source import NumFmt
 from openpyxl.chart.layout import Layout

stubs/openpyxl/openpyxl/chart/updown_bars.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.axis import ChartLines
 from openpyxl.descriptors.base import Typed

stubs/openpyxl/openpyxl/chartsheet/chartsheet.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl import _Decodable, _VisibilityType
 from openpyxl.chartsheet.custom import CustomChartsheetViews

stubs/openpyxl/openpyxl/chartsheet/custom.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, overload
 
 from openpyxl import _VisibilityType
 from openpyxl.descriptors.base import Bool, Integer, Set, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/chartsheet/properties.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Bool, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/chartsheet/protection.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Bool, Integer, String, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/chartsheet/publish.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/chartsheet/relation.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Alias, Integer
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/chartsheet/views.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/comments/comment_sheet.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
 from collections.abc import Generator
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.cell.text import Text
 from openpyxl.comments.author import AuthorList

stubs/openpyxl/openpyxl/compat/numbers.pyi

@@ -1,5 +1,6 @@
 from decimal import Decimal
-from typing_extensions import Final, TypeAlias
+from typing import Final
+from typing_extensions import TypeAlias
 
 # NOTE: Can't specify numpy as a dependency because openpyxl doesn't declare it as one
 # import numpy

stubs/openpyxl/openpyxl/compat/strings.pyi

@@ -1,5 +1,5 @@
 import sys
-from typing_extensions import Final
+from typing import Final
 
 VER: Final[sys._version_info]
 

stubs/openpyxl/openpyxl/descriptors/base.pyi

@@ -2,8 +2,8 @@ from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Readable
 from collections.abc import Iterable, Sized
 from datetime import datetime
 from re import Pattern
-from typing import Any, Generic, TypeVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import Any, Generic, Literal, TypeVar, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/descriptors/excel.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from . import Integer, MatchPattern, MinMax, Strict, String
 from .base import _M, _N

stubs/openpyxl/openpyxl/descriptors/nested.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Unused
 from collections.abc import Iterable
-from typing import Any, ClassVar, NoReturn, overload
-from typing_extensions import Literal, TypeAlias
+from typing import Any, ClassVar, Literal, NoReturn, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors import Strict
 from openpyxl.descriptors.base import Bool, Convertible, Descriptor, Float, Integer, MinMax, NoneSet, Set, String

stubs/openpyxl/openpyxl/descriptors/serialisable.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToInt, Incomplete, SupportsIter
 from collections.abc import Iterator
-from typing import Any, ClassVar, Protocol
-from typing_extensions import Final, Self
+from typing import Any, ClassVar, Final, Protocol
+from typing_extensions import Self
 
 from openpyxl.descriptors import MetaSerialisable
 from openpyxl.xml.functions import Element

stubs/openpyxl/openpyxl/drawing/colors.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
-from typing import ClassVar, overload
-from typing_extensions import Final, Literal, TypeAlias
+from typing import ClassVar, Final, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors import Strict, Typed
 from openpyxl.descriptors.base import Alias, Integer, MinMax, Set, _ConvertibleToBool

stubs/openpyxl/openpyxl/drawing/connector.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt
-from typing import ClassVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, overload
 
 from openpyxl.chart.shapes import GraphicalProperties
 from openpyxl.chart.text import RichText

stubs/openpyxl/openpyxl/drawing/effect.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, Float, Integer, Set, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/drawing/fill.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/drawing/geometry.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, Float, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import Coordinate, ExtensionList, Percentage

stubs/openpyxl/openpyxl/drawing/graphic.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Alias, Bool, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/drawing/image.pyi

@@ -1,8 +1,8 @@
 from _typeshed import SupportsRead
 from pathlib import Path
 from types import ModuleType
-from typing import Any
-from typing_extensions import Literal, TypeAlias
+from typing import Any, Literal
+from typing_extensions import TypeAlias
 
 # Is actually PIL.Image.Image
 _PILImageImage: TypeAlias = Any

stubs/openpyxl/openpyxl/drawing/line.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Integer, MinMax, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/drawing/picture.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.chart.shapes import GraphicalProperties
 from openpyxl.descriptors.base import Alias, Bool, String, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/drawing/properties.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, NoneSet, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/drawing/spreadsheet_drawing.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.nested import NestedText

stubs/openpyxl/openpyxl/drawing/text.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, Integer, MinMax, NoneSet, Set, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import Coordinate, ExtensionList

stubs/openpyxl/openpyxl/formatting/formatting.pyi

@@ -1,7 +1,6 @@
 from _typeshed import Incomplete, Unused
 from collections.abc import Iterator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Alias, Bool, Convertible, _ConvertibleToBool, _ConvertibleToMultiCellRange
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/formatting/rule.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors import Float, Strict
 from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/formula/tokenizer.pyi

@@ -1,6 +1,7 @@
 from _typeshed import Incomplete
 from re import Pattern
-from typing_extensions import Final, Literal, TypeAlias
+from typing import Final, Literal
+from typing_extensions import TypeAlias
 
 _TokenTypesNotOperand: TypeAlias = Literal[
     "LITERAL", "FUNC", "ARRAY", "PAREN", "SEP", "OPERATOR-PREFIX", "OPERATOR-INFIX", "OPERATOR-POSTFIX", "WHITE-SPACE"

stubs/openpyxl/openpyxl/formula/translate.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete
 from re import Pattern
-from typing_extensions import Final
+from typing import Final
 
 class TranslatorError(Exception): ...
 

stubs/openpyxl/openpyxl/packaging/core.pyi

@@ -1,7 +1,6 @@
 from _typeshed import Incomplete
 from datetime import datetime
-from typing import ClassVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, overload
 
 from openpyxl.descriptors import DateTime
 from openpyxl.descriptors.base import Alias

stubs/openpyxl/openpyxl/packaging/custom.pyi

@@ -1,8 +1,8 @@
 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 typing import Any, Final, Generic, Literal, TypeVar
+from typing_extensions import Self, TypeAlias
 
 from openpyxl.descriptors import Sequence, Strict
 from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, _ConvertibleToBool

stubs/openpyxl/openpyxl/packaging/extended.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Typed
 from openpyxl.descriptors.nested import NestedText

stubs/openpyxl/openpyxl/packaging/manifest.pyi

@@ -1,7 +1,6 @@
 from _typeshed import Incomplete
 from collections.abc import Generator
-from typing import ClassVar
-from typing_extensions import Final, Literal
+from typing import ClassVar, Final, Literal
 
 from openpyxl.descriptors.base import String
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/packaging/relationship.pyi

@@ -1,7 +1,6 @@
 from _typeshed import Incomplete, Unused
 from collections.abc import Generator
-from typing import ClassVar, TypeVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, TypeVar, overload
 from zipfile import ZipFile
 
 from openpyxl.descriptors.base import Alias, String

stubs/openpyxl/openpyxl/packaging/workbook.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl import _VisibilityType
 from openpyxl.descriptors.base import Alias, Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/pivot/cache.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete, Unused
 from datetime import datetime
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, Set, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/pivot/fields.pyi

@@ -1,7 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt, Incomplete
 from datetime import datetime
-from typing import ClassVar, overload
-from typing_extensions import Literal
+from typing import ClassVar, Literal, overload
 
 from openpyxl.descriptors.base import Bool, DateTime, Float, Integer, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/pivot/record.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Typed
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/pivot/table.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar, overload
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal, overload
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, Integer, NoneSet, Set, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/reader/excel.pyi

@@ -1,5 +1,6 @@
 from _typeshed import Incomplete
-from typing_extensions import Final, Literal, TypeAlias
+from typing import Final, Literal
+from typing_extensions import TypeAlias
 from zipfile import ZipFile
 
 from openpyxl import _ZipFileFileProtocol

stubs/openpyxl/openpyxl/styles/alignment.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToFloat, Incomplete
 from collections.abc import Iterator
-from typing import ClassVar
-from typing_extensions import Final, Literal, TypeAlias
+from typing import ClassVar, Final, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, Min, MinMax, NoneSet, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/styles/borders.pyi

@@ -1,7 +1,7 @@
 from _typeshed import Incomplete
 from collections.abc import Iterator
-from typing import ClassVar
-from typing_extensions import Final, Literal, TypeAlias
+from typing import ClassVar, Final, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Alias, Bool, NoneSet, Typed, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/styles/cell_style.pyi

@@ -1,8 +1,8 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
 from array import array
 from collections.abc import Iterable, MutableSequence
-from typing import ClassVar, Generic, TypeVar
-from typing_extensions import Literal, Self
+from typing import ClassVar, Generic, Literal, TypeVar
+from typing_extensions import Self
 
 from openpyxl.descriptors.base import Bool, Integer, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/styles/colors.pyi

@@ -1,8 +1,8 @@
 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 typing import ClassVar, Final, Literal, TypeVar, overload
+from typing_extensions import Self
 
 from openpyxl.descriptors import Strict, Typed
 from openpyxl.descriptors.base import _N, Bool, Integer, MinMax, String, _ConvertibleToBool

stubs/openpyxl/openpyxl/styles/differential.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, SupportsIndex
+from typing import ClassVar, Literal, SupportsIndex
 
 from openpyxl.descriptors.base import Alias, Typed
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/styles/fills.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToFloat, Incomplete, Unused
 from collections.abc import Iterable, Iterator, Sequence as ABCSequence
-from typing import ClassVar
-from typing_extensions import Final, Literal, TypeAlias
+from typing import ClassVar, Final, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors import Sequence, Strict
 from openpyxl.descriptors.base import Alias, Float, MinMax, NoneSet, Set

stubs/openpyxl/openpyxl/styles/fonts.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToFloat, ConvertibleToInt
-from typing import ClassVar
-from typing_extensions import Final, Literal, Self, TypeAlias
+from typing import ClassVar, Final, Literal
+from typing_extensions import Self, TypeAlias
 
 from openpyxl.descriptors.base import Alias, _ConvertibleToBool
 from openpyxl.descriptors.nested import (

stubs/openpyxl/openpyxl/styles/named_styles.pyi

@@ -1,7 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
 from collections.abc import Iterator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Bool, Integer, String, Typed, _ConvertibleToBool
 from openpyxl.descriptors.excel import ExtensionList

stubs/openpyxl/openpyxl/styles/numbers.pyi

@@ -1,7 +1,7 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
 from re import Pattern
-from typing import ClassVar, overload
-from typing_extensions import Final, Literal, SupportsIndex, TypeGuard
+from typing import ClassVar, Final, Literal, SupportsIndex, overload
+from typing_extensions import TypeGuard
 
 from openpyxl.descriptors import Strict, String
 from openpyxl.descriptors.base import Integer

stubs/openpyxl/openpyxl/styles/protection.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Bool, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/styles/stylesheet.pyi

@@ -1,6 +1,6 @@
 from _typeshed import Incomplete, Unused
-from typing import ClassVar, TypeVar
-from typing_extensions import Literal, Self
+from typing import ClassVar, Literal, TypeVar
+from typing_extensions import Self
 from zipfile import ZipFile
 
 from openpyxl.descriptors.base import Typed

stubs/openpyxl/openpyxl/styles/table.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 
 from openpyxl.descriptors.base import Bool, Integer, Set, String, _ConvertibleToBool
 from openpyxl.descriptors.serialisable import Serialisable

stubs/openpyxl/openpyxl/utils/cell.pyi

@@ -1,6 +1,7 @@
 from collections.abc import Generator
 from re import Pattern
-from typing_extensions import Final, TypeAlias
+from typing import Final
+from typing_extensions import TypeAlias
 
 # "1:1" | "A1:A1" | "A:A"
 _RangeBoundariesTuple: TypeAlias = tuple[None, int, None, int] | tuple[int, int, int, int] | tuple[int, None, int, None]

stubs/openpyxl/openpyxl/utils/datetime.pyi

@@ -1,6 +1,6 @@
 from datetime import datetime
 from re import Pattern
-from typing_extensions import Final
+from typing import Final
 
 MAC_EPOCH: Final[datetime]
 WINDOWS_EPOCH: Final[datetime]

stubs/openpyxl/openpyxl/utils/formulas.pyi

@@ -1,4 +1,4 @@
-from typing_extensions import Final
+from typing import Final
 
 FORMULAE: Final[frozenset[str]]
 

stubs/openpyxl/openpyxl/utils/inference.pyi

@@ -1,5 +1,5 @@
 from re import Pattern
-from typing_extensions import Final
+from typing import Final
 
 PERCENT_REGEX: Final[Pattern[str]]
 TIME_REGEX: Final[Pattern[str]]

stubs/openpyxl/openpyxl/utils/units.pyi

@@ -1,4 +1,4 @@
-from typing_extensions import Final
+from typing import Final
 
 DEFAULT_ROW_HEIGHT: Final[float]
 BASE_COL_WIDTH: Final = 8

stubs/openpyxl/openpyxl/workbook/child.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from re import Pattern
-from typing_extensions import Final
+from typing import Final
 
 from openpyxl import _Decodable
 from openpyxl.workbook.workbook import Workbook

stubs/openpyxl/openpyxl/workbook/defined_name.pyi

@@ -2,8 +2,7 @@ from _typeshed import ConvertibleToInt, Incomplete
 from collections import defaultdict
 from collections.abc import Generator, Iterator
 from re import Pattern
-from typing import ClassVar
-from typing_extensions import Final, Literal
+from typing import ClassVar, Final, Literal
 
 from openpyxl.descriptors import Sequence
 from openpyxl.descriptors.base import Alias, Bool, Integer, String, _ConvertibleToBool

stubs/openpyxl/openpyxl/workbook/external_link/external.pyi

@@ -1,6 +1,6 @@
 from _typeshed import ConvertibleToInt, Incomplete, Unused
-from typing import ClassVar
-from typing_extensions import Literal, TypeAlias
+from typing import ClassVar, Literal
+from typing_extensions import TypeAlias
 from zipfile import ZipFile
 
 from openpyxl.descriptors.base import Bool, Integer, NoneSet, String, Typed, _ConvertibleToBool

stubs/openpyxl/openpyxl/workbook/function_group.pyi

@@ -1,6 +1,5 @@
 from _typeshed import ConvertibleToInt, Incomplete
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from openpyxl.descriptors.base import Integer, String
 from openpyxl.descriptors.serialisable import Serialisable