From 0db44d24423a554e5813e3194e64e0a3a6e795fd Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Mon, 8 Aug 2022 13:40:07 -0700 Subject: [PATCH] Group typing_extensions imports next to typing (#13361) --- misc/proper_plugin.py | 1 - mypy/binder.py | 1 - mypy/build.py | 2 +- mypy/checker.py | 1 - mypy/checkexpr.py | 1 - mypy/checkpattern.py | 1 - mypy/checkstrformat.py | 1 - mypy/config_parser.py | 1 - mypy/constraints.py | 1 - mypy/defaults.py | 1 - mypy/dmypy_server.py | 1 - mypy/dmypy_util.py | 1 - mypy/errorcodes.py | 1 - mypy/errors.py | 1 - mypy/fastparse.py | 1 - mypy/find_sources.py | 1 - mypy/fixup.py | 1 - mypy/ipc.py | 1 - mypy/literals.py | 1 - mypy/main.py | 1 - mypy/message_registry.py | 1 - mypy/messages.py | 1 - mypy/modulefinder.py | 1 - mypy/nodes.py | 2 +- mypy/options.py | 1 - mypy/plugins/attrs.py | 1 - mypy/plugins/dataclasses.py | 1 - mypy/plugins/enums.py | 1 - mypy/plugins/functools.py | 1 - mypy/plugins/singledispatch.py | 1 - mypy/reachability.py | 1 - mypy/renaming.py | 1 - mypy/report.py | 3 +-- mypy/scope.py | 1 - mypy/semanal.py | 1 - mypy/semanal_classprop.py | 1 - mypy/semanal_enum.py | 1 - mypy/semanal_main.py | 1 - mypy/semanal_namedtuple.py | 1 - mypy/semanal_shared.py | 2 +- mypy/semanal_typeddict.py | 1 - mypy/server/mergecheck.py | 1 - mypy/server/objgraph.py | 1 - mypy/server/update.py | 1 - mypy/sharedparse.py | 1 - mypy/state.py | 1 - mypy/stats.py | 1 - mypy/stubdoc.py | 1 - mypy/stubgen.py | 1 - mypy/stubgenc.py | 1 - mypy/stubtest.py | 3 +-- mypy/stubutil.py | 1 - mypy/subtypes.py | 1 - mypy/suggestions.py | 1 - mypy/test/data.py | 2 +- mypy/typeanal.py | 1 - mypy/types.py | 1 - mypy/typestate.py | 1 - mypy/util.py | 1 - mypyc/analysis/attrdefined.py | 1 - mypyc/build.py | 1 - mypyc/codegen/cstring.py | 1 - mypyc/codegen/emit.py | 1 - mypyc/codegen/emitfunc.py | 1 - mypyc/codegen/literals.py | 1 - mypyc/common.py | 1 - mypyc/crash.py | 1 - mypyc/ir/func_ir.py | 1 - mypyc/ir/ops.py | 2 +- mypyc/ir/pprint.py | 1 - mypyc/ir/rtypes.py | 1 - mypyc/irbuild/builder.py | 1 - mypyc/irbuild/classdef.py | 1 - mypyc/irbuild/constant_fold.py | 1 - mypyc/irbuild/for_helpers.py | 1 - mypyc/irbuild/format_str_tokenizer.py | 1 - mypyc/irbuild/ll_builder.py | 1 - mypyc/irbuild/nonlocalcontrol.py | 1 - mypyc/primitives/registry.py | 1 - pyproject.toml | 1 + 80 files changed, 8 insertions(+), 81 deletions(-) diff --git a/misc/proper_plugin.py b/misc/proper_plugin.py index f82abb310bfe..b221ff86dd80 100644 --- a/misc/proper_plugin.py +++ b/misc/proper_plugin.py @@ -1,5 +1,4 @@ from typing import Callable, Optional - from typing_extensions import Type as typing_Type from mypy.nodes import TypeInfo diff --git a/mypy/binder.py b/mypy/binder.py index 62dc35a116b7..88c52a027107 100644 --- a/mypy/binder.py +++ b/mypy/binder.py @@ -1,7 +1,6 @@ from collections import defaultdict from contextlib import contextmanager from typing import DefaultDict, Dict, Iterator, List, Optional, Set, Tuple, Union, cast - from typing_extensions import TypeAlias as _TypeAlias from mypy.erasetype import remove_instance_last_known_values diff --git a/mypy/build.py b/mypy/build.py index 02a8bb0eda51..564177664758 100644 --- a/mypy/build.py +++ b/mypy/build.py @@ -42,9 +42,9 @@ TypeVar, Union, ) +from typing_extensions import Final, TypeAlias as _TypeAlias from mypy_extensions import TypedDict -from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.semanal_main from mypy.checker import TypeChecker diff --git a/mypy/checker.py b/mypy/checker.py index e64cea7b4cd1..d634e59d0603 100644 --- a/mypy/checker.py +++ b/mypy/checker.py @@ -24,7 +24,6 @@ cast, overload, ) - from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.checkexpr diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py index e245ca1cbd8f..565e20b9c243 100644 --- a/mypy/checkexpr.py +++ b/mypy/checkexpr.py @@ -15,7 +15,6 @@ Union, cast, ) - from typing_extensions import Final, TypeAlias as _TypeAlias, overload import mypy.checker diff --git a/mypy/checkpattern.py b/mypy/checkpattern.py index cbc2d89b8f9e..69d33a3f0b16 100644 --- a/mypy/checkpattern.py +++ b/mypy/checkpattern.py @@ -2,7 +2,6 @@ from collections import defaultdict from typing import Dict, List, NamedTuple, Optional, Set, Tuple, Union - from typing_extensions import Final import mypy.checker diff --git a/mypy/checkstrformat.py b/mypy/checkstrformat.py index 1566128ce850..52f249175538 100644 --- a/mypy/checkstrformat.py +++ b/mypy/checkstrformat.py @@ -24,7 +24,6 @@ Union, cast, ) - from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.errorcodes as codes diff --git a/mypy/config_parser.py b/mypy/config_parser.py index 339934733a73..613f127afd08 100644 --- a/mypy/config_parser.py +++ b/mypy/config_parser.py @@ -25,7 +25,6 @@ Tuple, Union, ) - from typing_extensions import Final, TypeAlias as _TypeAlias from mypy import defaults diff --git a/mypy/constraints.py b/mypy/constraints.py index b4c3cf6f28c9..d483fa1aeb40 100644 --- a/mypy/constraints.py +++ b/mypy/constraints.py @@ -1,7 +1,6 @@ """Type inference constraints.""" from typing import TYPE_CHECKING, Iterable, List, Optional, Sequence - from typing_extensions import Final import mypy.subtypes diff --git a/mypy/defaults.py b/mypy/defaults.py index cd689bf3f9c1..4fae1870749a 100644 --- a/mypy/defaults.py +++ b/mypy/defaults.py @@ -1,5 +1,4 @@ import os - from typing_extensions import Final PYTHON2_VERSION: Final = (2, 7) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index bd72783d5558..d5909569dcd9 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -16,7 +16,6 @@ import traceback from contextlib import redirect_stderr, redirect_stdout from typing import AbstractSet, Any, Callable, Dict, List, Optional, Sequence, Set, Tuple - from typing_extensions import Final import mypy.build diff --git a/mypy/dmypy_util.py b/mypy/dmypy_util.py index 31c1aee13860..5c1a4cd348dd 100644 --- a/mypy/dmypy_util.py +++ b/mypy/dmypy_util.py @@ -5,7 +5,6 @@ import json from typing import Any - from typing_extensions import Final from mypy.ipc import IPCBase diff --git a/mypy/errorcodes.py b/mypy/errorcodes.py index 7fa81b009a4c..da616299758b 100644 --- a/mypy/errorcodes.py +++ b/mypy/errorcodes.py @@ -4,7 +4,6 @@ """ from typing import Dict - from typing_extensions import Final error_codes: Dict[str, "ErrorCode"] = {} diff --git a/mypy/errors.py b/mypy/errors.py index 680e1571e078..273cfbc834fc 100644 --- a/mypy/errors.py +++ b/mypy/errors.py @@ -3,7 +3,6 @@ import traceback from collections import defaultdict from typing import Callable, Dict, List, NoReturn, Optional, Set, TextIO, Tuple, TypeVar, Union - from typing_extensions import Final, Literal from mypy import errorcodes as codes diff --git a/mypy/fastparse.py b/mypy/fastparse.py index cbb5af774125..f213dfb22ff0 100644 --- a/mypy/fastparse.py +++ b/mypy/fastparse.py @@ -4,7 +4,6 @@ import typing # for typing.Type, which conflicts with types.Type import warnings from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, TypeVar, Union, cast - from typing_extensions import Final, Literal, overload from mypy import defaults, errorcodes as codes, message_registry diff --git a/mypy/find_sources.py b/mypy/find_sources.py index cd9d9aa5f363..e2ed1109a2cb 100644 --- a/mypy/find_sources.py +++ b/mypy/find_sources.py @@ -3,7 +3,6 @@ import functools import os from typing import List, Optional, Sequence, Set, Tuple - from typing_extensions import Final from mypy.fscache import FileSystemCache diff --git a/mypy/fixup.py b/mypy/fixup.py index d138b007bd00..08a17e541d44 100644 --- a/mypy/fixup.py +++ b/mypy/fixup.py @@ -1,7 +1,6 @@ """Fix up various things after deserialization.""" from typing import Any, Dict, Optional - from typing_extensions import Final from mypy.lookup import lookup_fully_qualified diff --git a/mypy/ipc.py b/mypy/ipc.py index f9a78953afda..7f6926b18b9f 100644 --- a/mypy/ipc.py +++ b/mypy/ipc.py @@ -11,7 +11,6 @@ import tempfile from types import TracebackType from typing import Callable, Optional, Type - from typing_extensions import Final if sys.platform == "win32": diff --git a/mypy/literals.py b/mypy/literals.py index a34543bbed7f..6d3a8f2843fe 100644 --- a/mypy/literals.py +++ b/mypy/literals.py @@ -1,5 +1,4 @@ from typing import Any, Iterable, Optional, Tuple, Union - from typing_extensions import Final from mypy.nodes import ( diff --git a/mypy/main.py b/mypy/main.py index a33f66be6341..42917aadcd26 100644 --- a/mypy/main.py +++ b/mypy/main.py @@ -7,7 +7,6 @@ import time from gettext import gettext from typing import IO, Any, Dict, List, NoReturn, Optional, Sequence, TextIO, Tuple, Union - from typing_extensions import Final from mypy import build, defaults, state, util diff --git a/mypy/message_registry.py b/mypy/message_registry.py index 11c8696f73f4..963d8858753f 100644 --- a/mypy/message_registry.py +++ b/mypy/message_registry.py @@ -7,7 +7,6 @@ """ from typing import NamedTuple, Optional - from typing_extensions import Final from mypy import errorcodes as codes diff --git a/mypy/messages.py b/mypy/messages.py index 88e98633649e..d27dad0df5b7 100644 --- a/mypy/messages.py +++ b/mypy/messages.py @@ -26,7 +26,6 @@ Union, cast, ) - from typing_extensions import Final from mypy import errorcodes as codes, message_registry diff --git a/mypy/modulefinder.py b/mypy/modulefinder.py index 74b415503c35..f3173a9e81eb 100644 --- a/mypy/modulefinder.py +++ b/mypy/modulefinder.py @@ -20,7 +20,6 @@ import tomli as tomllib from typing import Dict, List, NamedTuple, Optional, Set, Tuple, Union - from typing_extensions import Final, TypeAlias as _TypeAlias from mypy import pyinfo diff --git a/mypy/nodes.py b/mypy/nodes.py index 3f7c81500dbf..606a2073219f 100644 --- a/mypy/nodes.py +++ b/mypy/nodes.py @@ -20,9 +20,9 @@ Union, cast, ) +from typing_extensions import Final, TypeAlias as _TypeAlias from mypy_extensions import trait -from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.strconv from mypy.bogus_type import Bogus diff --git a/mypy/options.py b/mypy/options.py index 9e407ae62479..d55272c538bc 100644 --- a/mypy/options.py +++ b/mypy/options.py @@ -2,7 +2,6 @@ import re import sys from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Pattern, Set, Tuple - from typing_extensions import Final from mypy import defaults diff --git a/mypy/plugins/attrs.py b/mypy/plugins/attrs.py index 6fe2529331ed..415746e58b51 100644 --- a/mypy/plugins/attrs.py +++ b/mypy/plugins/attrs.py @@ -1,7 +1,6 @@ """Plugin for supporting the attrs library (http://www.attrs.org)""" from typing import Dict, Iterable, List, Optional, Tuple, cast - from typing_extensions import Final import mypy.plugin # To avoid circular imports. diff --git a/mypy/plugins/dataclasses.py b/mypy/plugins/dataclasses.py index f360d1577b14..b8130c19dc96 100644 --- a/mypy/plugins/dataclasses.py +++ b/mypy/plugins/dataclasses.py @@ -1,7 +1,6 @@ """Plugin that provides support for dataclasses.""" from typing import Dict, List, Optional, Set, Tuple - from typing_extensions import Final from mypy.nodes import ( diff --git a/mypy/plugins/enums.py b/mypy/plugins/enums.py index 4451745f1589..2eb219f187d5 100644 --- a/mypy/plugins/enums.py +++ b/mypy/plugins/enums.py @@ -11,7 +11,6 @@ semanal_enum.py). """ from typing import Iterable, Optional, Sequence, TypeVar, cast - from typing_extensions import Final import mypy.plugin # To avoid circular imports. diff --git a/mypy/plugins/functools.py b/mypy/plugins/functools.py index f8bb9340a0e6..78e7c95bc43b 100644 --- a/mypy/plugins/functools.py +++ b/mypy/plugins/functools.py @@ -1,6 +1,5 @@ """Plugin for supporting the functools standard library module.""" from typing import Dict, NamedTuple, Optional - from typing_extensions import Final import mypy.plugin diff --git a/mypy/plugins/singledispatch.py b/mypy/plugins/singledispatch.py index a01942d88ab8..8bed4cc17c90 100644 --- a/mypy/plugins/singledispatch.py +++ b/mypy/plugins/singledispatch.py @@ -1,5 +1,4 @@ from typing import List, NamedTuple, Optional, Sequence, TypeVar, Union - from typing_extensions import Final from mypy.messages import format_type diff --git a/mypy/reachability.py b/mypy/reachability.py index e1dfc81bbe2f..b43092c424fb 100644 --- a/mypy/reachability.py +++ b/mypy/reachability.py @@ -1,7 +1,6 @@ """Utilities related to determining the reachability of code (in semantic analysis).""" from typing import Optional, Tuple, TypeVar, Union - from typing_extensions import Final from mypy.literals import literal diff --git a/mypy/renaming.py b/mypy/renaming.py index 6db8bbad7e14..abb3cd4aa8a1 100644 --- a/mypy/renaming.py +++ b/mypy/renaming.py @@ -1,6 +1,5 @@ from contextlib import contextmanager from typing import Dict, Iterator, List, Set - from typing_extensions import Final from mypy.nodes import ( diff --git a/mypy/report.py b/mypy/report.py index ca8aa03428c9..841139180f28 100644 --- a/mypy/report.py +++ b/mypy/report.py @@ -12,9 +12,8 @@ from abc import ABCMeta, abstractmethod from operator import attrgetter from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, cast -from urllib.request import pathname2url - from typing_extensions import Final, TypeAlias as _TypeAlias +from urllib.request import pathname2url from mypy import stats from mypy.defaults import REPORTER_NAMES diff --git a/mypy/scope.py b/mypy/scope.py index cc5ce6a704a8..c627b9d48ba1 100644 --- a/mypy/scope.py +++ b/mypy/scope.py @@ -5,7 +5,6 @@ from contextlib import contextmanager, nullcontext from typing import Iterator, List, Optional, Tuple - from typing_extensions import TypeAlias as _TypeAlias from mypy.nodes import FuncBase, TypeInfo diff --git a/mypy/semanal.py b/mypy/semanal.py index 7b1b09abb628..3ac0af8ba11e 100644 --- a/mypy/semanal.py +++ b/mypy/semanal.py @@ -63,7 +63,6 @@ Union, cast, ) - from typing_extensions import Final, TypeAlias as _TypeAlias from mypy import errorcodes as codes, message_registry diff --git a/mypy/semanal_classprop.py b/mypy/semanal_classprop.py index ff60d424002b..478430aaea1c 100644 --- a/mypy/semanal_classprop.py +++ b/mypy/semanal_classprop.py @@ -4,7 +4,6 @@ """ from typing import List, Optional, Set, Tuple - from typing_extensions import Final from mypy.errors import Errors diff --git a/mypy/semanal_enum.py b/mypy/semanal_enum.py index c571c958df00..f1c999995704 100644 --- a/mypy/semanal_enum.py +++ b/mypy/semanal_enum.py @@ -4,7 +4,6 @@ """ from typing import List, Optional, Tuple, cast - from typing_extensions import Final from mypy.nodes import ( diff --git a/mypy/semanal_main.py b/mypy/semanal_main.py index ca2139d9c822..a2f9cf3c7e98 100644 --- a/mypy/semanal_main.py +++ b/mypy/semanal_main.py @@ -26,7 +26,6 @@ from contextlib import nullcontext from typing import TYPE_CHECKING, Callable, List, Optional, Tuple, Union - from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.build diff --git a/mypy/semanal_namedtuple.py b/mypy/semanal_namedtuple.py index 6e4327d61f4b..55e38cdfa11d 100644 --- a/mypy/semanal_namedtuple.py +++ b/mypy/semanal_namedtuple.py @@ -5,7 +5,6 @@ from contextlib import contextmanager from typing import Dict, Iterator, List, Mapping, Optional, Tuple, cast - from typing_extensions import Final from mypy.exprtotype import TypeTranslationError, expr_to_unanalyzed_type diff --git a/mypy/semanal_shared.py b/mypy/semanal_shared.py index 85bf3b18d499..fd7bc363b077 100644 --- a/mypy/semanal_shared.py +++ b/mypy/semanal_shared.py @@ -2,9 +2,9 @@ from abc import abstractmethod from typing import Callable, List, Optional, Union +from typing_extensions import Final, Protocol from mypy_extensions import trait -from typing_extensions import Final, Protocol from mypy import join from mypy.errorcodes import ErrorCode diff --git a/mypy/semanal_typeddict.py b/mypy/semanal_typeddict.py index 69cc78aee88d..603eaabcc2d4 100644 --- a/mypy/semanal_typeddict.py +++ b/mypy/semanal_typeddict.py @@ -1,7 +1,6 @@ """Semantic analysis of TypedDict definitions.""" from typing import List, Optional, Set, Tuple - from typing_extensions import Final from mypy import errorcodes as codes diff --git a/mypy/server/mergecheck.py b/mypy/server/mergecheck.py index f75944249a62..4c2544cfabef 100644 --- a/mypy/server/mergecheck.py +++ b/mypy/server/mergecheck.py @@ -1,7 +1,6 @@ """Check for duplicate AST nodes after merge.""" from typing import Dict, List, Tuple - from typing_extensions import Final from mypy.nodes import Decorator, FakeInfo, FuncDef, SymbolNode, Var diff --git a/mypy/server/objgraph.py b/mypy/server/objgraph.py index 053c26eef1d1..4bde468d2bd3 100644 --- a/mypy/server/objgraph.py +++ b/mypy/server/objgraph.py @@ -4,7 +4,6 @@ import weakref from collections.abc import Iterable from typing import Dict, Iterator, List, Mapping, Tuple - from typing_extensions import Final method_descriptor_type: Final = type(object.__dir__) diff --git a/mypy/server/update.py b/mypy/server/update.py index f40c47236b41..b7d2db555082 100644 --- a/mypy/server/update.py +++ b/mypy/server/update.py @@ -116,7 +116,6 @@ import sys import time from typing import Callable, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, Union - from typing_extensions import Final from mypy.build import ( diff --git a/mypy/sharedparse.py b/mypy/sharedparse.py index 31135d5c0049..000a1442d6b4 100644 --- a/mypy/sharedparse.py +++ b/mypy/sharedparse.py @@ -1,5 +1,4 @@ from typing import Optional - from typing_extensions import Final """Shared logic between our three mypy parser files.""" diff --git a/mypy/state.py b/mypy/state.py index b289fcfe73ae..f21023ff3fff 100644 --- a/mypy/state.py +++ b/mypy/state.py @@ -1,6 +1,5 @@ from contextlib import contextmanager from typing import Iterator, Optional, Tuple - from typing_extensions import Final # These are global mutable state. Don't add anything here unless there's a very diff --git a/mypy/stats.py b/mypy/stats.py index 6d664a17bfef..a40bc445d85f 100644 --- a/mypy/stats.py +++ b/mypy/stats.py @@ -5,7 +5,6 @@ from collections import Counter from contextlib import contextmanager from typing import Dict, Iterator, List, Optional, Union, cast - from typing_extensions import Final from mypy import nodes diff --git a/mypy/stubdoc.py b/mypy/stubdoc.py index 8ec975bd4a42..608cdb375d2e 100644 --- a/mypy/stubdoc.py +++ b/mypy/stubdoc.py @@ -17,7 +17,6 @@ Sequence, Tuple, ) - from typing_extensions import Final # Type alias for signatures strings in format ('func_name', '(arg, opt_arg=False)'). diff --git a/mypy/stubgen.py b/mypy/stubgen.py index 9ae15fe0f063..fc4a7e0fcd9d 100755 --- a/mypy/stubgen.py +++ b/mypy/stubgen.py @@ -47,7 +47,6 @@ import traceback from collections import defaultdict from typing import Dict, Iterable, List, Mapping, Optional, Set, Tuple, Union, cast - from typing_extensions import Final import mypy.build diff --git a/mypy/stubgenc.py b/mypy/stubgenc.py index 66db4137fe50..37b81fffaf8d 100755 --- a/mypy/stubgenc.py +++ b/mypy/stubgenc.py @@ -10,7 +10,6 @@ import re from types import ModuleType from typing import Any, Dict, List, Mapping, Optional, Set, Tuple - from typing_extensions import Final from mypy.moduleinspect import is_c_module diff --git a/mypy/stubtest.py b/mypy/stubtest.py index a55436c0ed8e..2c530f9ab2e5 100644 --- a/mypy/stubtest.py +++ b/mypy/stubtest.py @@ -17,6 +17,7 @@ import traceback import types import typing +import typing_extensions import warnings from contextlib import redirect_stderr, redirect_stdout from functools import singledispatch @@ -35,8 +36,6 @@ Union, cast, ) - -import typing_extensions from typing_extensions import get_origin import mypy.build diff --git a/mypy/stubutil.py b/mypy/stubutil.py index cdf43db97578..87d27ac6fd65 100644 --- a/mypy/stubutil.py +++ b/mypy/stubutil.py @@ -5,7 +5,6 @@ import sys from contextlib import contextmanager from typing import Iterator, List, Optional, Tuple, Union - from typing_extensions import overload from mypy.modulefinder import ModuleNotFoundReason diff --git a/mypy/subtypes.py b/mypy/subtypes.py index 5a8c5e38b2fa..cdfb13c759ed 100644 --- a/mypy/subtypes.py +++ b/mypy/subtypes.py @@ -1,6 +1,5 @@ from contextlib import contextmanager from typing import Any, Callable, Iterator, List, Optional, Set, Tuple, TypeVar, Union, cast - from typing_extensions import Final, TypeAlias as _TypeAlias import mypy.applytype diff --git a/mypy/suggestions.py b/mypy/suggestions.py index a40537d39366..7bd1bed77763 100644 --- a/mypy/suggestions.py +++ b/mypy/suggestions.py @@ -38,7 +38,6 @@ Union, cast, ) - from typing_extensions import TypedDict from mypy.argmap import map_actuals_to_formals diff --git a/mypy/test/data.py b/mypy/test/data.py index de84736ac34c..ddfc3631fc44 100644 --- a/mypy/test/data.py +++ b/mypy/test/data.py @@ -9,9 +9,9 @@ import tempfile from abc import abstractmethod from typing import Any, Dict, Iterator, List, NamedTuple, Optional, Pattern, Set, Tuple, Union +from typing_extensions import Final import pytest -from typing_extensions import Final from mypy.test.config import PREFIX, test_data_prefix, test_temp_dir diff --git a/mypy/typeanal.py b/mypy/typeanal.py index 14e4a534fbf9..552990a8482b 100644 --- a/mypy/typeanal.py +++ b/mypy/typeanal.py @@ -4,7 +4,6 @@ from contextlib import contextmanager from itertools import chain from typing import Callable, Iterable, Iterator, List, Optional, Sequence, Set, Tuple, TypeVar - from typing_extensions import Final, Protocol from mypy import errorcodes as codes, message_registry, nodes diff --git a/mypy/types.py b/mypy/types.py index 0e030b917a7b..b7e76c9f9f6b 100644 --- a/mypy/types.py +++ b/mypy/types.py @@ -18,7 +18,6 @@ Union, cast, ) - from typing_extensions import Final, TypeAlias as _TypeAlias, overload import mypy.nodes diff --git a/mypy/typestate.py b/mypy/typestate.py index b3c27f473c0d..ea69671edba9 100644 --- a/mypy/typestate.py +++ b/mypy/typestate.py @@ -4,7 +4,6 @@ """ from typing import ClassVar, Dict, List, Optional, Set, Tuple - from typing_extensions import Final, TypeAlias as _TypeAlias from mypy.nodes import TypeInfo diff --git a/mypy/util.py b/mypy/util.py index a043963776b8..d82a3b99f512 100644 --- a/mypy/util.py +++ b/mypy/util.py @@ -24,7 +24,6 @@ TypeVar, Union, ) - from typing_extensions import Final, Literal try: diff --git a/mypyc/analysis/attrdefined.py b/mypyc/analysis/attrdefined.py index 77b6539eb8b7..84114d177a38 100644 --- a/mypyc/analysis/attrdefined.py +++ b/mypyc/analysis/attrdefined.py @@ -62,7 +62,6 @@ def foo(self) -> int: """ from typing import List, Set, Tuple - from typing_extensions import Final from mypyc.analysis.dataflow import ( diff --git a/mypyc/build.py b/mypyc/build.py index 2697f0eb7e01..e30338afd52f 100644 --- a/mypyc/build.py +++ b/mypyc/build.py @@ -24,7 +24,6 @@ import sys import time from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union, cast - from typing_extensions import TYPE_CHECKING, NoReturn, Type from mypy.build import BuildSource diff --git a/mypyc/codegen/cstring.py b/mypyc/codegen/cstring.py index c4d1a422f4d1..7c661f3173a1 100644 --- a/mypyc/codegen/cstring.py +++ b/mypyc/codegen/cstring.py @@ -19,7 +19,6 @@ """ import string - from typing_extensions import Final CHAR_MAP: Final = [f"\\{i:03o}" for i in range(256)] diff --git a/mypyc/codegen/emit.py b/mypyc/codegen/emit.py index a43249ec455c..65c8b57856e4 100644 --- a/mypyc/codegen/emit.py +++ b/mypyc/codegen/emit.py @@ -2,7 +2,6 @@ import sys from typing import Callable, Dict, List, Optional, Set, Tuple, Union - from typing_extensions import Final from mypyc.codegen.literals import Literals diff --git a/mypyc/codegen/emitfunc.py b/mypyc/codegen/emitfunc.py index ca93313dbf12..02ac625f88f5 100644 --- a/mypyc/codegen/emitfunc.py +++ b/mypyc/codegen/emitfunc.py @@ -1,7 +1,6 @@ """Code generation for native function bodies.""" from typing import List, Optional, Union - from typing_extensions import Final from mypyc.analysis.blockfreq import frequently_executed_blocks diff --git a/mypyc/codegen/literals.py b/mypyc/codegen/literals.py index 3b01afcb4982..0c1612b50bc3 100644 --- a/mypyc/codegen/literals.py +++ b/mypyc/codegen/literals.py @@ -1,5 +1,4 @@ from typing import Any, Dict, List, Tuple, Union, cast - from typing_extensions import Final # Supported Python literal types. All tuple items must have supported diff --git a/mypyc/common.py b/mypyc/common.py index ac238c41e953..bd22f5e43a07 100644 --- a/mypyc/common.py +++ b/mypyc/common.py @@ -1,6 +1,5 @@ import sys from typing import Any, Dict, Optional, Tuple - from typing_extensions import Final from mypy.util import unnamed_function diff --git a/mypyc/crash.py b/mypyc/crash.py index 0d2efe524e02..abf41cdfd4ed 100644 --- a/mypyc/crash.py +++ b/mypyc/crash.py @@ -2,7 +2,6 @@ import traceback from contextlib import contextmanager from typing import Iterator - from typing_extensions import NoReturn diff --git a/mypyc/ir/func_ir.py b/mypyc/ir/func_ir.py index 7bc0d879814d..36cd19420a55 100644 --- a/mypyc/ir/func_ir.py +++ b/mypyc/ir/func_ir.py @@ -1,7 +1,6 @@ """Intermediate representation of functions.""" from typing import List, Optional, Sequence - from typing_extensions import Final from mypy.nodes import ARG_POS, ArgKind, Block, FuncDef diff --git a/mypyc/ir/ops.py b/mypyc/ir/ops.py index f8015f99e898..737f0bb43f94 100644 --- a/mypyc/ir/ops.py +++ b/mypyc/ir/ops.py @@ -11,9 +11,9 @@ from abc import abstractmethod from typing import Dict, Generic, List, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union +from typing_extensions import TYPE_CHECKING, Final from mypy_extensions import trait -from typing_extensions import TYPE_CHECKING, Final from mypyc.ir.rtypes import ( RArray, diff --git a/mypyc/ir/pprint.py b/mypyc/ir/pprint.py index 252499bb7fc7..4f70f32b94a1 100644 --- a/mypyc/ir/pprint.py +++ b/mypyc/ir/pprint.py @@ -2,7 +2,6 @@ from collections import defaultdict from typing import Any, Dict, List, Sequence, Tuple, Union - from typing_extensions import Final from mypyc.common import short_name diff --git a/mypyc/ir/rtypes.py b/mypyc/ir/rtypes.py index 3247c2fb95f2..ed9a4e9856b2 100644 --- a/mypyc/ir/rtypes.py +++ b/mypyc/ir/rtypes.py @@ -22,7 +22,6 @@ from abc import abstractmethod from typing import Dict, Generic, List, Optional, Tuple, TypeVar, Union - from typing_extensions import TYPE_CHECKING, ClassVar, Final from mypyc.common import IS_32_BIT_PLATFORM, PLATFORM_SIZE, JsonDict, short_name diff --git a/mypyc/irbuild/builder.py b/mypyc/irbuild/builder.py index 25fd33c03391..cd6339fab235 100644 --- a/mypyc/irbuild/builder.py +++ b/mypyc/irbuild/builder.py @@ -12,7 +12,6 @@ """ from contextlib import contextmanager from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Set, Tuple, Union - from typing_extensions import Final, overload from mypy.build import Graph diff --git a/mypyc/irbuild/classdef.py b/mypyc/irbuild/classdef.py index f59475750de5..2f19e82e37ae 100644 --- a/mypyc/irbuild/classdef.py +++ b/mypyc/irbuild/classdef.py @@ -2,7 +2,6 @@ from abc import abstractmethod from typing import Callable, List, Optional, Set, Tuple - from typing_extensions import Final from mypy.nodes import ( diff --git a/mypyc/irbuild/constant_fold.py b/mypyc/irbuild/constant_fold.py index 9ded13f40586..aadf2ff467f3 100644 --- a/mypyc/irbuild/constant_fold.py +++ b/mypyc/irbuild/constant_fold.py @@ -4,7 +4,6 @@ """ from typing import Optional, Union - from typing_extensions import Final from mypy.nodes import Expression, IntExpr, MemberExpr, NameExpr, OpExpr, StrExpr, UnaryExpr, Var diff --git a/mypyc/irbuild/for_helpers.py b/mypyc/irbuild/for_helpers.py index 19cc383ace60..390b163bac86 100644 --- a/mypyc/irbuild/for_helpers.py +++ b/mypyc/irbuild/for_helpers.py @@ -6,7 +6,6 @@ """ from typing import Callable, List, Optional, Tuple, Union - from typing_extensions import ClassVar, Type from mypy.nodes import ( diff --git a/mypyc/irbuild/format_str_tokenizer.py b/mypyc/irbuild/format_str_tokenizer.py index 8c28621927fb..9363bc64caef 100644 --- a/mypyc/irbuild/format_str_tokenizer.py +++ b/mypyc/irbuild/format_str_tokenizer.py @@ -2,7 +2,6 @@ from enum import Enum, unique from typing import List, Optional, Tuple - from typing_extensions import Final from mypy.checkstrformat import ( diff --git a/mypyc/irbuild/ll_builder.py b/mypyc/irbuild/ll_builder.py index 16a07b8e49df..5cbd7858d975 100644 --- a/mypyc/irbuild/ll_builder.py +++ b/mypyc/irbuild/ll_builder.py @@ -9,7 +9,6 @@ """ from typing import Callable, List, Optional, Sequence, Tuple - from typing_extensions import Final from mypy.argmap import map_actuals_to_formals diff --git a/mypyc/irbuild/nonlocalcontrol.py b/mypyc/irbuild/nonlocalcontrol.py index 6266d1db0ae5..e2b7f4209d02 100644 --- a/mypyc/irbuild/nonlocalcontrol.py +++ b/mypyc/irbuild/nonlocalcontrol.py @@ -5,7 +5,6 @@ from abc import abstractmethod from typing import Optional, Union - from typing_extensions import TYPE_CHECKING from mypyc.ir.ops import ( diff --git a/mypyc/primitives/registry.py b/mypyc/primitives/registry.py index ca9f937ce768..2fe191e1fef3 100644 --- a/mypyc/primitives/registry.py +++ b/mypyc/primitives/registry.py @@ -36,7 +36,6 @@ """ from typing import Dict, List, NamedTuple, Optional, Tuple - from typing_extensions import Final from mypyc.ir.ops import StealsDescription diff --git a/pyproject.toml b/pyproject.toml index 75cf925743cf..95f65599a130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,6 +20,7 @@ profile = "black" line_length = 99 combine_as_imports = true skip_gitignore = true +extra_standard_library = ["typing_extensions"] skip = [ "mypy/typeshed", "mypyc/test-data",