Add code style improvements

Author: QuentinLee5

src/pip/_internal/index/package_finder.py

@@ -777,28 +777,6 @@ def get_state_as_tuple(self, immutable=False):
             target_python=self._target_python
         )
 
-    @staticmethod
-    def _sort_links_static(links):
-        # type: (Iterable[Link]) -> List[Link]
-        eggs, no_eggs = [], []
-        seen = set()  # type: Set[Link]
-        for link in links:
-            if link not in seen:
-                seen.add(link)
-                if link.egg_fragment:
-                    eggs.append(link)
-                else:
-                    no_eggs.append(link)
-        return no_eggs + eggs
-
-    def _sort_links(self, links):
-        # type: (Iterable[Link]) -> List[Link]
-        """
-        Returns elements of links in order, non-egg links first, egg links
-        second, while eliminating duplicates
-        """
-        return PackageFinder._sort_links_static(links)
-
     @staticmethod
     def _log_skipped_link_static(package_finder_tuple, link, reason):
         # type: (PackageFinderTuple, Link, str) -> None
@@ -810,10 +788,10 @@ def _log_skipped_link_static(package_finder_tuple, link, reason):
 
     def _log_skipped_link(self, link, reason):
         # type: (Link, str) -> None
-        PackageFinder._log_skipped_link_static(self.get_state_as_tuple(), link, reason)
+        self._log_skipped_link_static(self.get_state_as_tuple(), link, reason)
 
     @staticmethod
-    def get_install_candidate_static(
+    def _get_install_candidate_static(
         package_finder_tuple,   # type: PackageFinderTuple
         link_evaluator_tuple,   # type: LinkEvaluatorTuple
         link                    # type: Link
@@ -844,22 +822,33 @@ def get_install_candidate(self, link_evaluator, link):
         If the link is a candidate for install, convert it to an
         InstallationCandidate and return it. Otherwise, return None.
         """
-        return PackageFinder.get_install_candidate_static(
+        return self._get_install_candidate_static(
             self.get_state_as_tuple(),
             link_evaluator.get_state_as_tuple(),
             link
         )
 
     @staticmethod
-    def evaluate_links_static(
+    def _evaluate_links_static(
         package_finder_tuple,   # type: PackageFinderTuple
         link_evaluator_tuple,   # type: LinkEvaluatorTuple
         links                   # type: Iterable[Link]
     ):
         # type: (...) -> List[InstallationCandidate]
         candidates = []
-        for link in PackageFinder._sort_links_static(links):
-            candidate = PackageFinder.get_install_candidate_static(
+
+        eggs, no_eggs = [], []
+        seen = set()  # type: Set[Link]
+        for link in links:
+            if link not in seen:
+                seen.add(link)
+                if link.egg_fragment:
+                    eggs.append(link)
+                else:
+                    no_eggs.append(link)
+        links = no_eggs + eggs
+        for link in links:
+            candidate = PackageFinder._get_install_candidate_static(
                 package_finder_tuple,
                 link_evaluator_tuple,
                 link
@@ -874,14 +863,14 @@ def evaluate_links(self, link_evaluator, links):
         """
         Convert links that are candidates to InstallationCandidate objects.
         """
-        return PackageFinder.evaluate_links_static(
+        return self._evaluate_links_static(
             self.get_state_as_tuple(),
             link_evaluator.get_state_as_tuple(),
             links
         )
 
     @staticmethod
-    def process_project_url_static(
+    def _process_project_url_static(
         package_finder_tuple,   # type: PackageFinderTuple
         project_url,            # type: Link
         link_evaluator_tuple    # type: LinkEvaluatorTuple
@@ -897,7 +886,7 @@ def process_project_url_static(
         page_links = list(parse_links(html_page))
 
         with indent_log():
-            package_links = PackageFinder.evaluate_links_static(
+            package_links = PackageFinder._evaluate_links_static(
                 package_finder_tuple,
                 link_evaluator_tuple,
                 links=page_links,
@@ -907,15 +896,15 @@ def process_project_url_static(
 
     def process_project_url(self, project_url, link_evaluator):
         # type: (Link, LinkEvaluator) -> List[InstallationCandidate]
-        return PackageFinder.process_project_url_static(
+        return self._process_project_url_static(
             self.get_state_as_tuple(),
             project_url,
             link_evaluator.get_state_as_tuple()
         )
 
     @staticmethod
     @functools.lru_cache(maxsize=None)
-    def find_all_candidates_static(
+    def _find_all_candidates_static(
         package_finder_tuple,   # type: PackageFinderTuple
         link_evaluator_tuple,   # type: LinkEvaluatorTuple
         project_name            # type: str
@@ -943,7 +932,7 @@ def find_all_candidates_static(
             project_name
         )
 
-        find_links_versions = PackageFinder.evaluate_links_static(
+        find_links_versions = PackageFinder._evaluate_links_static(
             package_finder_tuple,
             link_evaluator_tuple,
             links=collected_links.find_links,
@@ -952,14 +941,14 @@ def find_all_candidates_static(
         # Only needs link collector from package_finder
         page_versions = []
         for project_url in collected_links.project_urls:
-            package_links = PackageFinder.process_project_url_static(
+            package_links = PackageFinder._process_project_url_static(
                 package_finder_tuple,
                 project_url,
                 link_evaluator_tuple,
             )
             page_versions.extend(package_links)
 
-        file_versions = PackageFinder.evaluate_links_static(
+        file_versions = PackageFinder._evaluate_links_static(
             package_finder_tuple,
             link_evaluator_tuple,
             links=collected_links.files,
@@ -989,16 +978,16 @@ def find_all_candidates(self, project_name):
         """
         link_evaluator = self.make_link_evaluator(project_name)
 
-        package_finder_tuple = self.get_state_as_tuple(True)
+        package_finder_tuple = self.get_state_as_tuple(immutable=True)
         link_evaluator_tuple = link_evaluator.get_state_as_tuple()
-        return PackageFinder.find_all_candidates_static(
+        return self._find_all_candidates_static(
             package_finder_tuple,
             link_evaluator_tuple,
             project_name
         )
 
     @staticmethod
-    def make_candidate_evaluator_static(
+    def _make_candidate_evaluator_static(
         package_finder_tuple,   # type: PackageFinderTuple
         project_name,           # type: str
         specifier=None,         # type: Optional[specifiers.BaseSpecifier]
@@ -1025,7 +1014,7 @@ def make_candidate_evaluator(
         """Create a CandidateEvaluator object to use.
         """
         package_finder_tuple = self.get_state_as_tuple()
-        return PackageFinder.make_candidate_evaluator_static(
+        return self._make_candidate_evaluator_static(
             package_finder_tuple,
             project_name,
             specifier,
@@ -1034,21 +1023,21 @@ def make_candidate_evaluator(
 
     @staticmethod
     @functools.lru_cache(maxsize=None)
-    def find_best_candidate_static(
+    def _find_best_candidate_static(
         package_finder_tuple,   # type: PackageFinderTuple
         link_evaluator_tuple,   # type: LinkEvaluatorTuple
         project_name,           # type: str
         specifier=None,         # type: Optional[specifiers.BaseSpecifier]
         hashes=None             # type: Optional[Hashes]
     ):
         # type: (...) -> BestCandidateResult
-        candidate_evaluator = PackageFinder.make_candidate_evaluator_static(
+        candidate_evaluator = PackageFinder._make_candidate_evaluator_static(
             package_finder_tuple,
             project_name,
             specifier,
             hashes
         )
-        candidates = PackageFinder.find_all_candidates_static(
+        candidates = PackageFinder._find_all_candidates_static(
             package_finder_tuple,
             link_evaluator_tuple,
             project_name
@@ -1074,10 +1063,10 @@ def find_best_candidate(
         """
         link_evaluator = self.make_link_evaluator(project_name)
 
-        package_finder_tuple = self.get_state_as_tuple(True)
+        package_finder_tuple = self.get_state_as_tuple(immutable=True)
         link_evaluator_tuple = link_evaluator.get_state_as_tuple()
 
-        return PackageFinder.find_best_candidate_static(
+        return self._find_best_candidate_static(
             package_finder_tuple,
             link_evaluator_tuple,
             project_name,

tests/unit/test_resolution_legacy_resolver.py

@@ -185,7 +185,7 @@ def _find_candidates(package_finder, link_evaluator, project_name):
         finder = make_test_finder()
         monkeypatch.setattr(
             PackageFinder,
-            "find_all_candidates_static",
+            "_find_all_candidates_static",
             _find_candidates
         )