Refactor: migrate imports from typing_extensions to typing (partial #8043)

Author: guilhermesenko

.gitignore

@@ -18,8 +18,7 @@
     cast,
     overload,
 )
-from typing import TypeGuard
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
 
 import mypy.checkexpr
 from mypy import errorcodes as codes, join, message_registry, nodes, operators

mypy/checker.py

@@ -9,8 +9,7 @@
 from collections.abc import Iterable, Iterator, Sequence
 from contextlib import contextmanager, nullcontext
 from typing import Callable, ClassVar, Final, Optional, cast, overload
-from typing import assert_never
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias, assert_never
 
 import mypy.checker
 import mypy.errorcodes as codes

mypy/checkexpr.py

@@ -15,8 +15,7 @@
 
 from collections.abc import Mapping, MutableMapping, Sequence
 from typing import Any, Callable, Final, TextIO, Union
-from typing import Never
-from typing_extensions import TypeAlias
+from typing_extensions import Never, TypeAlias
 
 from mypy import defaults
 from mypy.options import PER_MODULE_OPTIONS, Options

mypy/config_parser.py

@@ -4,7 +4,7 @@
 
 from collections.abc import Iterable, Sequence
 from typing import TYPE_CHECKING, Final, cast
-from typing import TypeGuard
+from typing_extensions import TypeGuard
 
 import mypy.subtypes
 import mypy.typeops

mypy/constraints.py

@@ -6,9 +6,8 @@
 from collections import defaultdict
 from collections.abc import Iterable, Iterator
 from itertools import chain
-from typing import Callable, Final, NoReturn, Optional, TextIO, TypeVar
-from typing import Literal
-from typing_extensions import Self, TypeAlias
+from typing import Callable, Final, Literal, NoReturn, Optional, TextIO, TypeVar
+from typing_extensions import Self, TypeAlias as _TypeAlias
 
 from mypy import errorcodes as codes
 from mypy.error_formatter import ErrorFormatter

mypy/errors.py

@@ -9,8 +9,7 @@
 from collections.abc import Iterator, Sequence
 from enum import Enum, unique
 from typing import TYPE_CHECKING, Any, Callable, Final, Optional, TypeVar, Union, cast
-from typing import TypeGuard
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
 
 from mypy_extensions import trait
 

mypy/nodes.py

@@ -53,8 +53,7 @@
 from collections.abc import Collection, Iterable, Iterator
 from contextlib import contextmanager
 from typing import Any, Callable, Final, TypeVar, cast
-from typing import TypeGuard
-from typing_extensions import TypeAlias
+from typing_extensions import TypeAlias as _TypeAlias, TypeGuard
 
 from mypy import errorcodes as codes, message_registry
 from mypy.constant_fold import constant_fold_expr

mypy/semanal.py

@@ -6,8 +6,7 @@
 from abc import abstractmethod
 from collections.abc import Iterable, Sequence
 from typing import TYPE_CHECKING, Any, ClassVar, Final, NewType, TypeVar, Union, cast, overload
-from typing import TypeGuard
-from typing_extensions import Self, TypeAlias
+from typing_extensions import Self, TypeAlias as _TypeAlias, TypeGuard
 
 import mypy.nodes
 from mypy.bogus_type import Bogus

mypy/types.py

@@ -0,0 +1,56 @@
+import os
+import re
+
+SAFE_TO_MOVE = {
+    "Literal",
+    "Final",
+    "Protocol",
+    "TypedDict",
+    "SupportsIndex",
+    "Never",
+    "TypeGuard",
+    "assert_never",
+}
+
+KEEP_IN_EXT = {"Self", "TypeAlias", "TypeAliasType"}
+
+
+def process_file(path: str):
+    changed = False
+    with open(path, encoding="utf-8") as f:
+        content = f.read()
+
+    # Divide imports
+    matches = re.findall(r"from typing_extensions import (.+)", content)
+    for match in matches:
+        parts = [p.strip().split(" as ")[0] for p in match.split(",")]
+        move = [p for p in parts if p in SAFE_TO_MOVE]
+        keep = [p for p in parts if p in KEEP_IN_EXT]
+
+        # Se houver itens para mover
+        if move:
+            old_line = f"from typing_extensions import {match}"
+            new_parts = [", ".join(keep)] if keep else []
+            if new_parts:
+                new_line_ext = f"from typing_extensions import {', '.join(keep)}"
+            else:
+                new_line_ext = ""
+
+            new_line_typ = f"from typing import {', '.join(move)}"
+
+            replacement = new_line_typ + ("\n" + new_line_ext if new_line_ext else "")
+            content = content.replace(old_line, replacement)
+            changed = True
+
+    if changed:
+        with open(path, "w", encoding="utf-8") as f:
+            f.write(content)
+        print(f"✅ Updated {path}")
+
+
+for root, _, files in os.walk("mypy/mypy"):
+    for file in files:
+        if not file.endswith(".py"):
+            continue
+        path = os.path.join(root, file)
+        process_file(path)