Manually fix issues that could not be automatically fixed

Author: pradyunsg

src/pip/__init__.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 
 __version__ = "25.2.dev0"
 

src/pip/_internal/__init__.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import Optional
 
 from pip._internal.utils import _log
 

src/pip/_internal/cli/command_context.py

@@ -1,6 +1,6 @@
 from collections.abc import Generator
-from contextlib import ExitStack, contextmanager
-from typing import ContextManager, TypeVar
+from contextlib import AbstractContextManager, ExitStack, contextmanager
+from typing import TypeVar
 
 _T = TypeVar("_T", covariant=True)
 
@@ -22,7 +22,7 @@ def main_context(self) -> Generator[None, None, None]:
         finally:
             self._in_main_context = False
 
-    def enter_context(self, context_provider: ContextManager[_T]) -> _T:
+    def enter_context(self, context_provider: AbstractContextManager[_T]) -> _T:
         assert self._in_main_context
 
         return self._main_context.enter_context(context_provider)

src/pip/_internal/commands/__init__.py

@@ -4,7 +4,7 @@
 
 import importlib
 from collections import namedtuple
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pip._internal.cli.base_command import Command
 

src/pip/_internal/commands/freeze.py

@@ -1,6 +1,5 @@
 import sys
 from optparse import Values
-from typing import AbstractSet
 
 from pip._internal.cli import cmdoptions
 from pip._internal.cli.base_command import Command
@@ -13,7 +12,7 @@ def _should_suppress_build_backends() -> bool:
     return sys.version_info < (3, 12)
 
 
-def _dev_pkgs() -> AbstractSet[str]:
+def _dev_pkgs() -> set[str]:
     pkgs = {"pip"}
 
     if _should_suppress_build_backends():

src/pip/_internal/locations/__init__.py

@@ -4,7 +4,7 @@
 import pathlib
 import sys
 import sysconfig
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pip._internal.models.scheme import SCHEME_KEYS, Scheme
 from pip._internal.utils.compat import WINDOWS

src/pip/_internal/metadata/__init__.py

@@ -2,7 +2,7 @@
 import functools
 import os
 import sys
-from typing import List, Literal, Optional, Protocol, Type, cast
+from typing import Literal, Optional, Protocol, cast
 
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.misc import strtobool

src/pip/_internal/req/__init__.py

@@ -2,7 +2,7 @@
 import logging
 from collections.abc import Generator, Sequence
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Optional
 
 from pip._internal.cli.progress_bars import get_install_progress_renderer
 from pip._internal.utils.logging import indent_log

tests/conftest.py

@@ -9,20 +9,13 @@
 import sys
 import threading
 from collections.abc import Iterable, Iterator
+from contextlib import AbstractContextManager
 from dataclasses import dataclass
 from enum import Enum
 from hashlib import sha256
 from pathlib import Path
 from textwrap import dedent
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    AnyStr,
-    Callable,
-    ClassVar,
-    ContextManager,
-    Optional,
-)
+from typing import TYPE_CHECKING, Any, AnyStr, Callable, ClassVar, Optional
 from unittest.mock import patch
 from zipfile import ZipFile
 
@@ -332,7 +325,7 @@ def scoped_global_tempdir_manager(request: pytest.FixtureRequest) -> Iterator[No
     temporary directories in the application.
     """
     if "no_auto_tempdir_manager" in request.keywords:
-        ctx: Callable[[], ContextManager[None]] = contextlib.nullcontext
+        ctx: Callable[[], AbstractContextManager[None]] = contextlib.nullcontext
     else:
         ctx = global_tempdir_manager
 

tests/lib/__init__.py

@@ -13,19 +13,7 @@
 from hashlib import sha256
 from io import BytesIO, StringIO
 from textwrap import dedent
-from typing import (
-    Any,
-    AnyStr,
-    Callable,
-    Dict,
-    List,
-    Literal,
-    Optional,
-    Protocol,
-    Tuple,
-    Union,
-    cast,
-)
+from typing import Any, AnyStr, Callable, Literal, Optional, Protocol, Union, cast
 from urllib.parse import urlparse, urlunparse
 from urllib.request import pathname2url
 from zipfile import ZipFile