Merge pull request #8248 from McSinyx/ireq-get-direct

Fix typo and simplify ireq call

src/pip/_internal/resolution/resolvelib/candidates.py

@@ -461,7 +461,7 @@ def __init__(self, py_version_info):
     def name(self):
         # type: () -> str
         # Avoid conflicting with the PyPI package "Python".
-        return "<Python fom Requires-Python>"
+        return "<Python from Requires-Python>"
 
     @property
     def version(self):

src/pip/_internal/resolution/resolvelib/provider.py

@@ -6,7 +6,6 @@
 if MYPY_CHECK_RUNNING:
     from typing import Any, Dict, Optional, Sequence, Set, Tuple, Union
 
-    from pip._internal.req.req_install import InstallRequirement
     from pip._vendor.packaging.version import _BaseVersion
 
     from .base import Requirement, Candidate
@@ -105,10 +104,6 @@ def sort_key(c):
 
         return sorted(matches, key=sort_key)
 
-    def get_install_requirement(self, c):
-        # type: (Candidate) -> Optional[InstallRequirement]
-        return c.get_install_requirement()
-
     def identify(self, dependency):
         # type: (Union[Requirement, Candidate]) -> str
         return dependency.name

src/pip/_internal/resolution/resolvelib/resolver.py

@@ -159,7 +159,7 @@ def resolve(self, root_reqs, check_supported_wheels):
 
         req_set = RequirementSet(check_supported_wheels=check_supported_wheels)
         for candidate in self._result.mapping.values():
-            ireq = provider.get_install_requirement(candidate)
+            ireq = candidate.get_install_requirement()
             if ireq is None:
                 continue
             ireq.should_reinstall = self.factory.should_reinstall(candidate)