Merge pull request #9384 from jdufresne/contextlib

Author: uranusjr

news/contextlib2.vendor.rst

@@ -0,0 +1 @@
+Remove contextlib2.

pyproject.toml

@@ -49,7 +49,6 @@ drop = [
 [tool.vendoring.typing-stubs]
 six = ["six.__init__", "six.moves.__init__", "six.moves.configparser"]
 appdirs = []
-contextlib2 = []
 
 [tool.vendoring.license.directories]
 setuptools = "pkg_resources"

src/pip/_internal/cli/command_context.py

@@ -1,8 +1,6 @@
-from contextlib import contextmanager
+from contextlib import ExitStack, contextmanager
 from typing import TYPE_CHECKING
 
-from pip._vendor.contextlib2 import ExitStack
-
 if TYPE_CHECKING:
     from typing import ContextManager, Iterator, TypeVar
 

src/pip/_internal/cli/parser.py

@@ -8,10 +8,9 @@
 import shutil
 import sys
 import textwrap
+from contextlib import suppress
 from typing import TYPE_CHECKING
 
-from pip._vendor.contextlib2 import suppress
-
 from pip._internal.cli.status_codes import UNKNOWN_ERROR
 from pip._internal.configuration import Configuration, ConfigurationError
 from pip._internal.utils.misc import redact_auth_from_url, strtobool

src/pip/_internal/req/req_tracker.py

@@ -4,8 +4,6 @@
 import os
 from typing import TYPE_CHECKING
 
-from pip._vendor import contextlib2
-
 from pip._internal.utils.temp_dir import TempDirectory
 
 if TYPE_CHECKING:
@@ -49,7 +47,7 @@ def update_env_context_manager(**changes):
 def get_requirement_tracker():
     # type: () -> Iterator[RequirementTracker]
     root = os.environ.get('PIP_REQ_TRACKER')
-    with contextlib2.ExitStack() as ctx:
+    with contextlib.ExitStack() as ctx:
         if root is None:
             root = ctx.enter_context(
                 TempDirectory(kind='req-tracker')

src/pip/_internal/utils/temp_dir.py

@@ -3,11 +3,9 @@
 import logging
 import os.path
 import tempfile
-from contextlib import contextmanager
+from contextlib import ExitStack, contextmanager
 from typing import TYPE_CHECKING
 
-from pip._vendor.contextlib2 import ExitStack
-
 from pip._internal.utils.misc import enum, rmtree
 
 if TYPE_CHECKING:

src/pip/_vendor/__init__.py

@@ -62,7 +62,6 @@ def vendored(modulename):
     vendored("cachecontrol")
     vendored("certifi")
     vendored("colorama")
-    vendored("contextlib2")
     vendored("distlib")
     vendored("distro")
     vendored("html5lib")