Update typing_extensions imports in stdlib (#11244)

Co-authored-by: AlexWaygood <alex.waygood@gmail.com>

stdlib/lib2to3/fixer_base.pyi

@@ -1,8 +1,7 @@
 from _typeshed import Incomplete, StrPath
 from abc import ABCMeta, abstractmethod
 from collections.abc import MutableMapping
-from typing import ClassVar, TypeVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal, TypeVar
 
 from .pytree import Base, Leaf, Node
 

stdlib/lib2to3/fixes/fix_apply.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_asserts.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from ..fixer_base import BaseFix
 

stdlib/lib2to3/fixes/fix_basestring.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_buffer.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_dict.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 fixer_base
 

stdlib/lib2to3/fixes/fix_except.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Generator, Iterable
-from typing import ClassVar, TypeVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal, TypeVar
 
 from .. import fixer_base
 from ..pytree import Base

stdlib/lib2to3/fixes/fix_exec.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_execfile.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_exitfunc.pyi

@@ -1,7 +1,6 @@
 from _typeshed import Incomplete, StrPath
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from ..pytree import Node
 

stdlib/lib2to3/fixes/fix_filter.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_funcattrs.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_future.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_getcwdu.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_has_key.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_idioms.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_import.pyi

@@ -1,7 +1,6 @@
 from _typeshed import StrPath
 from collections.abc import Generator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Node

stdlib/lib2to3/fixes/fix_imports.pyi

@@ -1,7 +1,6 @@
 from _typeshed import StrPath
 from collections.abc import Generator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Node

stdlib/lib2to3/fixes/fix_input.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 fixer_base
 

stdlib/lib2to3/fixes/fix_intern.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_isinstance.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_itertools.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_itertools_imports.pyi

@@ -1,6 +1,5 @@
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 class FixItertoolsImports(fixer_base.BaseFix):
     BM_compatible: ClassVar[Literal[True]]

stdlib/lib2to3/fixes/fix_long.pyi

@@ -1,6 +1,5 @@
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 class FixLong(fixer_base.BaseFix):
     BM_compatible: ClassVar[Literal[True]]

stdlib/lib2to3/fixes/fix_map.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_metaclass.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Generator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Base

stdlib/lib2to3/fixes/fix_methodattrs.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_ne.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_next.pyi

@@ -1,6 +1,5 @@
 from _typeshed import StrPath
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Node

stdlib/lib2to3/fixes/fix_nonzero.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_numliterals.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_operator.pyi

@@ -1,6 +1,5 @@
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 def invocation(s): ...
 

stdlib/lib2to3/fixes/fix_paren.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_print.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 fixer_base
 

stdlib/lib2to3/fixes/fix_raise.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_raw_input.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_reduce.pyi

@@ -1,6 +1,5 @@
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 class FixReduce(fixer_base.BaseFix):
     BM_compatible: ClassVar[Literal[True]]

stdlib/lib2to3/fixes/fix_reload.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_renames.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Generator
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_repr.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_set_literal.pyi

@@ -1,6 +1,5 @@
 from lib2to3 import fixer_base
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 class FixSetLiteral(fixer_base.BaseFix):
     BM_compatible: ClassVar[Literal[True]]

stdlib/lib2to3/fixes/fix_standarderror.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_sys_exc.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_throw.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_tuple_params.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 fixer_base
 

stdlib/lib2to3/fixes/fix_types.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_unicode.pyi

@@ -1,6 +1,5 @@
 from _typeshed import StrPath
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Node

stdlib/lib2to3/fixes/fix_urllib.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Generator
-from typing_extensions import Literal
+from typing import Literal
 
 from .fix_imports import FixImports
 

stdlib/lib2to3/fixes/fix_ws_comma.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Leaf

stdlib/lib2to3/fixes/fix_xrange.pyi

@@ -1,6 +1,5 @@
 from _typeshed import Incomplete, StrPath
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 from ..pytree import Node

stdlib/lib2to3/fixes/fix_xreadlines.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/fixes/fix_zip.pyi

@@ -1,5 +1,4 @@
-from typing import ClassVar
-from typing_extensions import Literal
+from typing import ClassVar, Literal
 
 from .. import fixer_base
 

stdlib/lib2to3/main.pyi

@@ -1,8 +1,7 @@
 from _typeshed import FileDescriptorOrPath
 from collections.abc import Container, Iterable, Iterator, Mapping, Sequence
 from logging import _ExcInfoType
-from typing import AnyStr
-from typing_extensions import Literal
+from typing import AnyStr, Literal
 
 from . import refactor as refactor
 

stdlib/lib2to3/pytree.pyi

@@ -1,7 +1,8 @@
 from _typeshed import Incomplete, SupportsGetItem, SupportsLenAndGetItem, Unused
 from abc import abstractmethod
 from collections.abc import Iterable, Iterator, MutableSequence
-from typing_extensions import Final, Self, TypeAlias
+from typing import Final
+from typing_extensions import Self, TypeAlias
 
 from .fixer_base import BaseFix
 from .pgen2.grammar import Grammar

stdlib/lib2to3/refactor.pyi

@@ -3,8 +3,7 @@ from collections.abc import Container, Generator, Iterable, Mapping
 from logging import Logger, _ExcInfoType
 from multiprocessing import JoinableQueue
 from multiprocessing.synchronize import Lock
-from typing import Any, ClassVar, NoReturn, overload
-from typing_extensions import Final
+from typing import Any, ClassVar, Final, NoReturn, overload
 
 from .btm_matcher import BottomMatcher
 from .fixer_base import BaseFix