Remove get_installed_distributions usages

The function itself is kept for now because it's currently used to test
the pip.metadata subpackage...

Author: uranusjr

src/pip/_internal/cli/autocompletion.py

@@ -9,7 +9,7 @@
 
 from pip._internal.cli.main_parser import create_main_parser
 from pip._internal.commands import commands_dict, create_command
-from pip._internal.utils.misc import get_installed_distributions
+from pip._internal.metadata import get_default_environment
 
 
 def autocomplete() -> None:
@@ -45,10 +45,11 @@ def autocomplete() -> None:
             "uninstall",
         ]
         if should_list_installed:
+            env = get_default_environment()
             lc = current.lower()
             installed = [
                 dist.key
-                for dist in get_installed_distributions(local_only=True)
+                for dist in env.iter_installed_distributions(local_only=True)
                 if dist.key.startswith(lc) and dist.key not in cwords[1:]
             ]
             # if there are no dists installed, fall back to option completion

src/pip/_internal/metadata/base.py

@@ -108,6 +108,10 @@ def local(self) -> bool:
     def in_usersite(self) -> bool:
         raise NotImplementedError()
 
+    @property
+    def in_site_packages(self) -> bool:
+        raise NotImplementedError()
+
     def read_text(self, name: str) -> str:
         """Read a file in the .dist-info (or .egg-info) directory.
 

src/pip/_internal/metadata/pkg_resources.py

@@ -61,6 +61,10 @@ def local(self) -> bool:
     def in_usersite(self) -> bool:
         return misc.dist_in_usersite(self._dist)
 
+    @property
+    def in_site_packages(self) -> bool:
+        return misc.dist_in_site_packages(self._dist)
+
     def read_text(self, name: str) -> str:
         if not self._dist.has_metadata(name):
             raise FileNotFoundError(name)

src/pip/_internal/operations/check.py

@@ -9,8 +9,8 @@
 from pip._vendor.pkg_resources import RequirementParseError
 
 from pip._internal.distributions import make_distribution_for_install_requirement
+from pip._internal.metadata import get_default_environment
 from pip._internal.req.req_install import InstallRequirement
-from pip._internal.utils.misc import get_installed_distributions
 
 if TYPE_CHECKING:
     from pip._vendor.packaging.utils import NormalizedName
@@ -30,16 +30,12 @@
 PackageDetails = namedtuple('PackageDetails', ['version', 'requires'])
 
 
-def create_package_set_from_installed(**kwargs: Any) -> Tuple["PackageSet", bool]:
-    """Converts a list of distributions into a PackageSet.
-    """
-    # Default to using all packages installed on the system
-    if kwargs == {}:
-        kwargs = {"local_only": False, "skip": ()}
-
+def create_package_set_from_installed() -> Tuple["PackageSet", bool]:
+    """Converts a list of distributions into a PackageSet."""
     package_set = {}
     problems = False
-    for dist in get_installed_distributions(**kwargs):
+    env = get_default_environment()
+    for dist in env.iter_installed_distributions(local_only=False, skip=()):
         name = canonicalize_name(dist.project_name)
         try:
             package_set[name] = PackageDetails(dist.version, dist.requires())

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

@@ -22,7 +22,6 @@
 from pip._vendor.packaging.requirements import Requirement as PackagingRequirement
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
-from pip._vendor.pkg_resources import Distribution
 from pip._vendor.resolvelib import ResolutionImpossible
 
 from pip._internal.cache import CacheEntry, WheelCache
@@ -35,6 +34,7 @@
     UnsupportedWheel,
 )
 from pip._internal.index.package_finder import PackageFinder
+from pip._internal.metadata import BaseDistribution, get_default_environment
 from pip._internal.models.link import Link
 from pip._internal.models.wheel import Wheel
 from pip._internal.operations.prepare import RequirementPreparer
@@ -46,11 +46,6 @@
 from pip._internal.resolution.base import InstallRequirementProvider
 from pip._internal.utils.compatibility_tags import get_supported
 from pip._internal.utils.hashes import Hashes
-from pip._internal.utils.misc import (
-    dist_in_site_packages,
-    dist_in_usersite,
-    get_installed_distributions,
-)
 from pip._internal.utils.virtualenv import running_under_virtualenv
 
 from .base import Candidate, CandidateVersion, Constraint, Requirement
@@ -122,9 +117,10 @@ def __init__(
         ] = {}
 
         if not ignore_installed:
+            env = get_default_environment()
             self._installed_dists = {
-                canonicalize_name(dist.project_name): dist
-                for dist in get_installed_distributions(local_only=False)
+                dist.canonical_name: dist
+                for dist in env.iter_installed_distributions(local_only=False)
             }
         else:
             self._installed_dists = {}
@@ -155,15 +151,15 @@ def _make_extras_candidate(
 
     def _make_candidate_from_dist(
         self,
-        dist: Distribution,
+        dist: BaseDistribution,
         extras: FrozenSet[str],
         template: InstallRequirement,
     ) -> Candidate:
         try:
-            base = self._installed_candidate_cache[dist.key]
+            base = self._installed_candidate_cache[dist.canonical_name]
         except KeyError:
             base = AlreadyInstalledCandidate(dist, template, factory=self)
-            self._installed_candidate_cache[dist.key] = base
+            self._installed_candidate_cache[dist.canonical_name] = base
         if not extras:
             return base
         return self._make_extras_candidate(base, extras)
@@ -520,7 +516,7 @@ def get_wheel_cache_entry(
             supported_tags=get_supported(),
         )
 
-    def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[Distribution]:
+    def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[BaseDistribution]:
         # TODO: Are there more cases this needs to return True? Editable?
         dist = self._installed_dists.get(candidate.project_name)
         if dist is None:  # Not installed, no uninstallation required.
@@ -533,21 +529,19 @@ def get_dist_to_uninstall(self, candidate: Candidate) -> Optional[Distribution]:
             return dist
 
         # We're installing into user site. Remove the user site installation.
-        if dist_in_usersite(dist):
+        if dist.in_usersite:
             return dist
 
         # We're installing into user site, but the installed incompatible
         # package is in global site. We can't uninstall that, and would let
         # the new user installation to "shadow" it. But shadowing won't work
         # in virtual environments, so we error out.
-        if running_under_virtualenv() and dist_in_site_packages(dist):
-            raise InstallationError(
-                "Will not install to the user site because it will "
-                "lack sys.path precedence to {} in {}".format(
-                    dist.project_name,
-                    dist.location,
-                )
+        if running_under_virtualenv() and dist.in_site_packages:
+            message = (
+                f"Will not install to the user site because it will lack "
+                f"sys.path precedence to {dist.raw_name} in {dist.location}"
             )
+            raise InstallationError(message)
         return None
 
     def _report_requires_python_error(

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

@@ -22,7 +22,6 @@
 )
 from pip._internal.utils.deprecation import deprecated
 from pip._internal.utils.filetypes import is_archive_file
-from pip._internal.utils.misc import dist_is_editable
 
 from .base import Candidate, Requirement
 from .factory import Factory
@@ -122,7 +121,7 @@ def resolve(
             elif parse_version(installed_dist.version) != candidate.version:
                 # The installation is different in version -- reinstall.
                 ireq.should_reinstall = True
-            elif candidate.is_editable or dist_is_editable(installed_dist):
+            elif candidate.is_editable or installed_dist.editable:
                 # The incoming distribution is editable, or different in
                 # editable-ness to installation -- reinstall.
                 ireq.should_reinstall = True