Group typing_extensions imports next to typing (#13361)

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

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

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

mypy/checker.py

@@ -24,7 +24,6 @@
  cast,
  overload,
 )
-
 from typing_extensions import Final, TypeAlias as _TypeAlias
 
 import mypy.checkexpr

mypy/checkexpr.py

@@ -15,7 +15,6 @@
  Union,
  cast,
 )
-
 from typing_extensions import Final, TypeAlias as _TypeAlias, overload
 
 import mypy.checker

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

mypy/checkstrformat.py

@@ -24,7 +24,6 @@
  Union,
  cast,
 )
-
 from typing_extensions import Final, TypeAlias as _TypeAlias
 
 import mypy.errorcodes as codes

mypy/config_parser.py

@@ -25,7 +25,6 @@
  Tuple,
  Union,
 )
-
 from typing_extensions import Final, TypeAlias as _TypeAlias
 
 from mypy import defaults

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

mypy/defaults.py

@@ -1,5 +1,4 @@
 import os
-
 from typing_extensions import Final
 
 PYTHON2_VERSION: Final = (2, 7)

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

mypy/dmypy_util.py

@@ -5,7 +5,6 @@
 
 import json
 from typing import Any
-
 from typing_extensions import Final
 
 from mypy.ipc import IPCBase

mypy/errorcodes.py

@@ -4,7 +4,6 @@
 """
 
 from typing import Dict
-
 from typing_extensions import Final
 
 error_codes: Dict[str, "ErrorCode"] = {}

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

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

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

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

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":

mypy/literals.py

@@ -1,5 +1,4 @@
 from typing import Any, Iterable, Optional, Tuple, Union
-
 from typing_extensions import Final
 
 from mypy.nodes import (

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

mypy/message_registry.py

@@ -7,7 +7,6 @@
 """
 
 from typing import NamedTuple, Optional
-
 from typing_extensions import Final
 
 from mypy import errorcodes as codes

mypy/messages.py

@@ -26,7 +26,6 @@
  Union,
  cast,
 )
-
 from typing_extensions import Final
 
 from mypy import errorcodes as codes, message_registry

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

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

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

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.

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 (

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.

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

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

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

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 (

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

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

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

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

mypy/semanal_enum.py

@@ -4,7 +4,6 @@
 """
 
 from typing import List, Optional, Tuple, cast
-
 from typing_extensions import Final
 
 from mypy.nodes import (

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

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

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

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

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

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__)

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 (

mypy/sharedparse.py

@@ -1,5 +1,4 @@
 from typing import Optional
-
 from typing_extensions import Final
 
 """Shared logic between our three mypy parser files."""

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

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

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)').

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

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