openrewrite-migrate-python 0.14.0.dev20260903174925__tar.gz → 0.14.0.dev20260904170449__tar.gz

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260903174925
+Version: 0.14.0.dev20260904170449
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary
@@ -21,7 +21,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: openrewrite>=8.91.4; extra == "dev"
+Requires-Dist: openrewrite>=8.91.5; extra == "dev"
 Requires-Dist: pydantic>=2.11; extra == "dev"
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "openrewrite-migrate-python"
 description = "OpenRewrite recipes for migrating Python codebases to newer Python versions."
-version = "0.14.0.dev20260903174925"  # Updated dynamically during release
+version = "0.14.0.dev20260904170449"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"
@@ -30,11 +30,7 @@ dependencies = []
 
 [project.optional-dependencies]
 dev = [
-    # openrewrite is host-provided at runtime, so this floor only pins what dev/CI test
-    # against: the current release, so that recipes meet the LST a current CLI produces.
-    # 8.91.4 is the first with `Py.Shebang` (openrewrite/rewrite#8729), which a shebanged
-    # file puts at `statements[0]` ahead of its imports.
-    "openrewrite>=8.91.4",
+    "openrewrite>=8.91.5",
     # Needed so type-attribution tests can resolve `pydantic` types.
     "pydantic>=2.11",
     "pytest>=8.0.0",

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_code_quality_python/codequality/_reindent.py

@@ -7,8 +7,6 @@ to a shallower nesting level means rewriting every line it spans.
 from typing import Optional, TypeVar
 
 from rewrite.java.support_types import Space
-from rewrite.java.tree import Statement
-from rewrite.python.tree import ExpressionStatement, StatementExpression
 from rewrite.python.visitor import PythonVisitor
 
 T = TypeVar("T")
@@ -27,20 +25,6 @@ def inherited_prefix(dropped: Space, body: Space) -> Space:
     )
 
 
-def with_prefix(stmt: Statement, prefix: Space) -> Statement:
-    """Set the prefix of *stmt*, threading through the ``Py`` wrappers whose
-    own prefix is a read-only view of the node they hold.
-
-    Drop once openrewrite/rewrite#8742 is the version floor: it gives those
-    wrappers a write path, so `stmt.replace(_prefix=...)` suffices alone.
-    """
-    if isinstance(stmt, ExpressionStatement):
-        return stmt.replace(_expression=with_prefix(stmt.expression, prefix))
-    if isinstance(stmt, StatementExpression):
-        return stmt.replace(_statement=with_prefix(stmt.statement, prefix))
-    return stmt.replace(_prefix=prefix)
-
-
 def line_indent(space: Space) -> Optional[str]:
     """Indentation of the line the token following *space* starts on, or
     ``None`` when that token shares a line with what precedes it.

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_code_quality_python/codequality/all_branches_identical.py

@@ -25,7 +25,6 @@ from openrewrite_code_quality_python.codequality._reindent import (
     inherited_prefix,
     line_indent,
     reindent,
-    with_prefix,
 )
 from openrewrite_code_quality_python.codequality._semantically_equal import SemanticallyEqual
 
@@ -193,8 +192,8 @@ def _replace_identical_ifs_padded(padded_stmts) -> Optional[list]:
         # separating it from the next one is recorded.
         result.append(
             first.replace(
-                _element=with_prefix(
-                    first.element, inherited_prefix(s.prefix, first.element.prefix)
+                _element=first.element.replace(
+                    _prefix=inherited_prefix(s.prefix, first.element.prefix)
                 )
             )
         )

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_code_quality_python/codequality/collapsible_if_statements.py

@@ -36,7 +36,6 @@ from openrewrite_code_quality_python.codequality._reindent import (
     inherited_prefix,
     line_indent,
     reindent,
-    with_prefix,
 )
 
 _CodeQuality = [
@@ -198,9 +197,8 @@ class CollapsibleIfStatements(Recipe):
                 inner_body = inner_body.replace(
                     _statements=[
                         first.replace(
-                            _element=with_prefix(
-                                first.element,
-                                inherited_prefix(inner.prefix, first.element.prefix),
+                            _element=first.element.replace(
+                                _prefix=inherited_prefix(inner.prefix, first.element.prefix)
                             )
                         ),
                         *inner_body._statements[1:],

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/_from_imports.py

@@ -1,9 +1,10 @@
 """Resolving a receiver-less call to the module member it was imported from."""
 
-from typing import Dict, Optional
+from typing import Dict, Optional, Set
 
 from rewrite import Cursor
 from rewrite.java.tree import FieldAccess, Identifier, J, MethodInvocation
+from rewrite.python import scope_of
 from rewrite.python.import_utils import get_alias_name, get_name_string, get_qualid_name
 from rewrite.python.scope_utils import LocalBindings
 from rewrite.python.tree import CompilationUnit, MultiImport
@@ -19,18 +20,17 @@ def _is_relative(from_: J) -> bool:
 class FromImports:
     """The members of ``module`` a file binds with ``from <module> import <member>``.
 
-    Under this form the call has no receiver, and for a symbol the typeshed in
-    use omits, no resolved declaring type either. The releases that removed
-    these APIs span many versions, so no declared version resolves them all —
-    attribution quality does not make this fallback redundant.
+    A call spells the name its import bound, which an alias makes differ from the
+    member the type gates match on.
     """
 
     def __init__(self, module: str) -> None:
         self._module = module
         self._members: Dict[str, str] = {}
+        self._bound: Set[str] = set()
         self._locals = LocalBindings()
 
-    def scan(self, cu: CompilationUnit) -> None:
+    def scan(self, cu: CompilationUnit, cursor: Cursor) -> None:
         """Record the file's bindings; call from ``visit_compilation_unit``.
 
         Top-level ``from`` statements only, since a guarded import's fallback may
@@ -48,6 +48,17 @@ class FromImports:
             for imp in stmt.names:
                 name = get_qualid_name(imp.qualid)
                 self._members.setdefault(get_alias_name(imp) or name, name)
+        # A member this module already binds is one `maybe_add_import` reconciles.
+        self._bound = scope_of(cursor).names() - set(self._members)
+
+    def binds(self, name: str) -> bool:
+        """Whether the module scope binds ``name`` outside this module's imports.
+
+        A replacement spelled unqualified resolves to the nearest module-scope
+        binding, so emitting one where something else holds the name redirects
+        the call rather than migrating it.
+        """
+        return name in self._bound
 
     def member_called(self, method: MethodInvocation, cursor: Cursor) -> Optional[str]:
         """The ``module`` member a receiver-less ``method`` calls, if it calls one."""

openrewrite_migrate_python-0.14.0.dev20260904170449/src/openrewrite_migrate_python/migrate/_typing_imports.py

@@ -0,0 +1,71 @@
+"""Internal helpers for locating references to the typing module in a file."""
+
+from typing import Dict, Iterator, Optional, Sequence, Set, Tuple
+
+from rewrite.java.support_types import Statement
+from rewrite.java.tree import If, Import
+from rewrite.python.import_utils import get_alias_name, get_name_string, get_qualid_name
+from rewrite.python.remove_import import (
+    RemoveImportOptions,
+    maybe_remove_import,
+    unconditional_body,
+)
+from rewrite.python.tree import CompilationUnit, MultiImport
+from rewrite.python.visitor import PythonVisitor
+
+
+def _module_scope_statements(statements: Sequence[Statement]) -> Iterator[Statement]:
+    """Every statement binding names in the module scope, `if` bodies included.
+
+    `if TYPE_CHECKING:` is where files that defer their annotations keep their
+    typing imports.
+    """
+    for stmt in statements:
+        yield stmt
+        body = unconditional_body(stmt) if isinstance(stmt, If) else None
+        if body is not None:
+            yield from _module_scope_statements(body.statements)
+
+
+def scan_typing_imports(cu: CompilationUnit) -> Tuple[Dict[str, str], Set[str]]:
+    """Map how this file can reference typing members.
+
+    Returns:
+        A tuple of:
+        - exposed name -> typing member, for ``from typing import member [as alias]``
+        - the set of names bound to the typing module itself, for
+          ``import typing [as alias]``
+    """
+    members: Dict[str, str] = {}
+    module_refs: Set[str] = set()
+    for stmt in _module_scope_statements(cu.statements):
+        if isinstance(stmt, MultiImport):
+            if stmt.from_ is not None:
+                if get_name_string(stmt.from_) == "typing":
+                    for imp in stmt.names:
+                        name = get_qualid_name(imp.qualid)
+                        members.setdefault(get_alias_name(imp) or name, name)
+            else:
+                for imp in stmt.names:
+                    if get_qualid_name(imp.qualid) == "typing":
+                        module_refs.add(get_alias_name(imp) or "typing")
+        elif isinstance(stmt, Import):
+            if get_qualid_name(stmt.qualid) == "typing":
+                module_refs.add(get_alias_name(stmt) or "typing")
+    return members, module_refs
+
+
+def maybe_remove_typing_import(visitor: PythonVisitor, name: Optional[str] = None) -> None:
+    """Schedule removal of a typing import once it is no longer used."""
+    maybe_remove_import(visitor, RemoveImportOptions(module="typing", name=name))
+
+
+def maybe_remove_typing_module_import(visitor: PythonVisitor, module_refs: Set[str]) -> None:
+    """Schedule removal of `import typing` once it is no longer used.
+
+    RemoveImport's usage check counts `typing` identifiers, which an aliased
+    module import doesn't produce — removal is only scheduled when an
+    unaliased `import typing` exists.
+    """
+    if "typing" in module_refs:
+        maybe_remove_typing_import(visitor)

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/gettext_deprecations.py

@@ -115,7 +115,7 @@ class ReplaceGettextDeprecations(Recipe):
                 self._imports = FromImports("gettext")
 
             def visit_compilation_unit(self, cu: CompilationUnit, p: ExecutionContext) -> J:
-                self._imports.scan(cu)
+                self._imports.scan(cu, self.cursor)
                 return super().visit_compilation_unit(cu, p)
 
             def visit_method_invocation(
@@ -139,7 +139,7 @@ class ReplaceGettextDeprecations(Recipe):
                 # the import moves to the replacement along with the call.
                 member = self._imports.member_called(method, self.cursor)
                 new_name = GETTEXT_DEPRECATIONS.get(member) if member else None
-                if new_name is None:
+                if new_name is None or self._imports.binds(new_name):
                     return method
                 maybe_add_import(self, AddImportOptions(module="gettext", name=new_name))
                 maybe_remove_import(self, RemoveImportOptions(module="gettext", name=member))

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/locale_deprecations.py

@@ -153,7 +153,7 @@ class ReplaceLocaleResetlocale(Recipe):
                 self._imports = FromImports("locale")
 
             def visit_compilation_unit(self, cu: CompilationUnit, p: ExecutionContext) -> J:
-                self._imports.scan(cu)
+                self._imports.scan(cu, self.cursor)
                 return super().visit_compilation_unit(cu, p)
 
             def visit_method_invocation(
@@ -175,6 +175,8 @@ class ReplaceLocaleResetlocale(Recipe):
                 if self._imports.member_called(method, self.cursor) == "resetlocale":
                     # `setlocale` and `LC_ALL` are spelled unqualified, so each
                     # needs an import of its own.
+                    if any(self._imports.binds(n) for n in ("setlocale", "LC_ALL")):
+                        return method
                     for name in ("setlocale", "LC_ALL"):
                         maybe_add_import(self, AddImportOptions(module="locale", name=name))
                     maybe_remove_import(

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/platform_deprecations.py

@@ -93,7 +93,7 @@ class ReplacePlatformPopen(Recipe):
                 self._imports = FromImports("platform")
 
             def visit_compilation_unit(self, cu: CompilationUnit, p: ExecutionContext) -> J:
-                self._imports.scan(cu)
+                self._imports.scan(cu, self.cursor)
                 return super().visit_compilation_unit(cu, p)
 
             def visit_method_invocation(

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/ssl_deprecations.py

@@ -92,7 +92,7 @@ class FindSslMatchHostname(Recipe):
                 self._imports = FromImports("ssl")
 
             def visit_compilation_unit(self, cu: CompilationUnit, p: ExecutionContext) -> J:
-                self._imports.scan(cu)
+                self._imports.scan(cu, self.cursor)
                 return super().visit_compilation_unit(cu, p)
 
             def visit_method_invocation(

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python/migrate/typing_deprecations.py

@@ -20,14 +20,12 @@ handled with `ChangeImport` in `upgrade_to_python39`.
 See: https://peps.python.org/pep-0585/
 """
 
-import ast
 from typing import Any, ClassVar, Optional, Set, cast
 
 from rewrite import ExecutionContext, Recipe, Tree, TreeVisitor
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
-from rewrite.python.markers import Quoted
 from rewrite.python.scope_utils import LocalBindings
 from rewrite.visitor import Cursor
 
@@ -53,7 +51,6 @@ from rewrite.java.tree import (
     Identifier,
     Import,
     J,
-    Literal,
     ParameterizedType,
     VariableDeclarations,
 )
@@ -181,61 +178,13 @@ def _make_builtin_alias_editor(
 
             result = cast(CompilationUnit, super().visit_compilation_unit(cu, p))
 
-            # A string forward reference is neither renamed above nor seen by
-            # RemoveImport's usage check; scanning the rewritten tree finds the
-            # ones that outlived the rename.
-            if self._bare_ref is not None and not self._forward_reference_survives(
-                result, self._bare_ref
-            ):
+            if self._bare_ref is not None:
                 maybe_remove_typing_import(self, old_name)
             if self._rewrote_qualified:
                 maybe_remove_typing_module_import(self, self._module_refs)
 
             return result
 
-        @staticmethod
-        def _forward_reference_survives(cu: CompilationUnit, name: str) -> bool:
-            """True when a string forward reference still names ``name``.
-
-            The parser leaves such a reference as text -- a string `Literal`
-            annotation, or an `Identifier` marked `Quoted` -- so its contents are
-            parsed as an expression. Prose that merely spells the name out, as a
-            docstring does, is not an expression and so is not a reference.
-            """
-            found = False
-
-            def names_target(text: str) -> bool:
-                if name not in text:
-                    return False
-                try:
-                    parsed = ast.parse(text.strip(), mode="eval")
-                except (SyntaxError, ValueError):
-                    return False
-                return any(
-                    isinstance(node, ast.Name) and node.id == name
-                    for node in ast.walk(parsed)
-                )
-
-            class ForwardReferenceScan(PythonVisitor[Any]):
-                def visit_literal(self, literal: Literal, p: Any) -> J:
-                    nonlocal found
-                    if not found and isinstance(literal.value, str) and names_target(literal.value):
-                        found = True
-                    return literal
-
-                def visit_identifier(self, ident: Identifier, p: Any) -> J:
-                    nonlocal found
-                    if (
-                        not found
-                        and ident.markers.find_first(Quoted) is not None
-                        and names_target(ident.simple_name)
-                    ):
-                        found = True
-                    return ident
-
-            ForwardReferenceScan().visit(cu, None)
-            return found
-
         def visit_field_access(self, field_access: FieldAccess, p: ExecutionContext) -> J:
             if (
                 isinstance(field_access.target, Identifier)

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.14.0.dev20260903174925
+Version: 0.14.0.dev20260904170449
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary
@@ -21,7 +21,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-Requires-Dist: openrewrite>=8.91.4; extra == "dev"
+Requires-Dist: openrewrite>=8.91.5; extra == "dev"
 Requires-Dist: pydantic>=2.11; extra == "dev"
 Requires-Dist: pytest>=8.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/src/openrewrite_migrate_python.egg-info/requires.txt

@@ -1,6 +1,6 @@
 
 [dev]
-openrewrite>=8.91.4
+openrewrite>=8.91.5
 pydantic>=2.11
 pytest>=8.0.0
 pytest-cov>=4.0.0

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/tests/test_gettext_deprecations.py

@@ -100,3 +100,19 @@ class TestReplaceGettextDeprecations:
                 """
             )
         )
+
+    def test_no_change_when_the_replacement_name_is_already_bound(self):
+        """The added import would be shadowed by the file's own `gettext`."""
+        spec = RecipeSpec(recipe=ReplaceGettextDeprecations())
+        spec.rewrite_run(
+            python(
+                """
+                from gettext import lgettext
+
+                def gettext(m):
+                    return m
+
+                msg = lgettext("Hello")
+                """
+            )
+        )

{openrewrite_migrate_python-0.14.0.dev20260903174925 → openrewrite_migrate_python-0.14.0.dev20260904170449}/tests/test_locale_deprecations.py

@@ -108,3 +108,47 @@ class TestReplaceLocaleResetlocale:
                 """
             )
         )
+
+    def test_no_change_when_a_name_it_would_import_is_already_bound(self):
+        """Either name, already bound, would capture the replacement's reference."""
+        spec = RecipeSpec(recipe=ReplaceLocaleResetlocale())
+        spec.rewrite_run(
+            python(
+                """
+                from locale import resetlocale
+
+                def setlocale(*args):
+                    return "mine"
+
+                resetlocale()
+                """
+            )
+        )
+        spec.rewrite_run(
+            python(
+                """
+                from locale import resetlocale
+
+                LC_ALL = "mine"
+
+                resetlocale()
+                """
+            )
+        )
+
+    def test_rewrites_when_the_module_already_imports_the_replacement(self):
+        spec = RecipeSpec(recipe=ReplaceLocaleResetlocale())
+        spec.rewrite_run(
+            python(
+                """
+                from locale import LC_ALL, resetlocale, setlocale
+
+                resetlocale()
+                """,
+                """
+                from locale import LC_ALL, setlocale
+
+                setlocale(LC_ALL, "")
+                """,
+            )
+        )

openrewrite_migrate_python-0.14.0.dev20260903174925/src/openrewrite_migrate_python/migrate/_typing_imports.py

@@ -1,164 +0,0 @@
-"""Internal helpers for locating references to the typing module in a file."""
-
-from typing import Any, Dict, Iterator, List, Optional, Sequence, Set, Tuple, cast
-
-from rewrite.java.support_types import JRightPadded, Space, Statement
-from rewrite.java.tree import Block, If, Import, J
-from rewrite.python.import_utils import get_alias_name, get_name_string, get_qualid_name
-from rewrite.python.remove_import import RemoveImport, RemoveImportOptions, prefix_to_inherit
-from rewrite.python.tree import CompilationUnit, MultiImport
-from rewrite.python.visitor import PythonVisitor
-
-
-def _module_scope_statements(statements: Sequence[Statement]) -> Iterator[Statement]:
-    """Every statement binding names in the module scope, `if` bodies included.
-
-    `if TYPE_CHECKING:` is where files that defer their annotations keep their
-    typing imports.
-    """
-    for stmt in statements:
-        yield stmt
-        body = _unconditional_body(stmt) if isinstance(stmt, If) else None
-        if body is not None:
-            yield from _module_scope_statements(body.statements)
-
-
-def _unconditional_body(if_: If) -> Optional[Block]:
-    """The body of an `if` that only adds bindings to the enclosing scope.
-
-    None once there is an `else`: the branches are then alternative bindings of
-    the same name, and honouring one would rewrite the other's binding too.
-    """
-    then_part = if_.then_part
-    return then_part if if_.else_part is None and isinstance(then_part, Block) else None
-
-
-def scan_typing_imports(cu: CompilationUnit) -> Tuple[Dict[str, str], Set[str]]:
-    """Map how this file can reference typing members.
-
-    Returns:
-        A tuple of:
-        - exposed name -> typing member, for ``from typing import member [as alias]``
-        - the set of names bound to the typing module itself, for
-          ``import typing [as alias]``
-    """
-    members: Dict[str, str] = {}
-    module_refs: Set[str] = set()
-    for stmt in _module_scope_statements(cu.statements):
-        if isinstance(stmt, MultiImport):
-            if stmt.from_ is not None:
-                if get_name_string(stmt.from_) == "typing":
-                    for imp in stmt.names:
-                        name = get_qualid_name(imp.qualid)
-                        members.setdefault(get_alias_name(imp) or name, name)
-            else:
-                for imp in stmt.names:
-                    if get_qualid_name(imp.qualid) == "typing":
-                        module_refs.add(get_alias_name(imp) or "typing")
-        elif isinstance(stmt, Import):
-            if get_qualid_name(stmt.qualid) == "typing":
-                module_refs.add(get_alias_name(stmt) or "typing")
-    return members, module_refs
-
-
-def maybe_remove_typing_import(visitor: PythonVisitor, name: Optional[str] = None) -> None:
-    """Schedule removal of a typing import once it is no longer used.
-
-    Mirrors the SDK's `maybe_remove_import`, registering the block-aware visitor.
-    """
-    options = RemoveImportOptions(module="typing", name=name)
-    if visitor._after_visit is None:
-        visitor._after_visit = []
-    for scheduled in visitor._after_visit:
-        # Only this visitor counts as already scheduled: a plain `RemoveImport`
-        # for the same name reaches the top level alone, and would leave the
-        # nested imports this exists to remove.
-        if (
-            type(scheduled) is _RemoveImportInBlocks
-            and scheduled.module == options.module
-            and scheduled.name == options.name
-        ):
-            return
-    visitor._after_visit.append(_RemoveImportInBlocks(options))
-
-
-def maybe_remove_typing_module_import(visitor: PythonVisitor, module_refs: Set[str]) -> None:
-    """Schedule removal of `import typing` once it is no longer used.
-
-    RemoveImport's usage check counts `typing` identifiers, which an aliased
-    module import doesn't produce — removal is only scheduled when an
-    unaliased `import typing` exists.
-    """
-    if "typing" in module_refs:
-        maybe_remove_typing_import(visitor)
-
-
-class _RemoveImportInBlocks(RemoveImport):
-    """`RemoveImport` extended to imports inside module-scope `if` bodies.
-
-    The base visitor prunes only the file's top-level statement list.
-    """
-
-    def visit_compilation_unit(self, cu: CompilationUnit, p: Any) -> J:
-        cu = cast(CompilationUnit, super().visit_compilation_unit(cu, p))
-        kept = self._prune(cu.padding.statements, prune_imports=False)
-        return cu if kept is None else cu.padding.replace(_statements=kept)
-
-    def _prune(
-        self, padded_statements: Sequence[JRightPadded], prune_imports: bool
-    ) -> Optional[List[JRightPadded]]:
-        """The statements with the import gone, or None when nothing changed."""
-        kept: List[JRightPadded] = []
-        inherited: Optional[Space] = None
-        changed = False
-        for index, padded in enumerate(padded_statements):
-            stmt = padded.element
-            if isinstance(stmt, If):
-                result: Optional[Statement] = self._prune_if(stmt)
-            elif prune_imports and isinstance(stmt, MultiImport):
-                result = self._process_multi_import(stmt)
-            elif prune_imports and isinstance(stmt, Import):
-                result = self._process_single_import(stmt)
-            else:
-                result = stmt
-
-            if result is None:
-                changed = True
-                if inherited is None:
-                    inherited = prefix_to_inherit(stmt, index)
-                continue
-            if result is not stmt:
-                padded = JRightPadded(result, padded.after, padded.markers)
-                changed = True
-            if inherited is not None:
-                if not padded.element.prefix.comments:
-                    padded = JRightPadded(
-                        padded.element.replace(prefix=inherited), padded.after, padded.markers
-                    )
-                elif inherited.comments:
-                    # Neither comment can be given up, and one prefix holds both.
-                    return None
-                inherited = None
-            kept.append(padded)
-        # A leftover prefix means nothing followed the removal to carry it, so a
-        # comment on the removed statement would be dropped with it.
-        if inherited is not None and inherited.comments:
-            return None
-        return kept if changed else None
-
-    def _prune_if(self, if_: If) -> Optional[If]:
-        """`if_` with the import gone from its body, or None once that empties it."""
-        then_part = _unconditional_body(if_)
-        if then_part is None:
-            return if_
-        kept = self._prune(then_part.padding.statements, prune_imports=True)
-        if kept is None:
-            return if_
-        if not kept:
-            return None
-        padded = if_.padding.then_part
-        return if_.padding.replace(
-            _then_part=JRightPadded(
-                then_part.padding.replace(_statements=kept), padded.after, padded.markers
-            )
-        )