Update code for linting issues

Author: sepehr-rs

src/pip/_internal/index/collector.py

@@ -231,9 +231,8 @@ def parse_links(page: IndexContent) -> Iterable[Link]:
     if content_type_l.startswith("application/vnd.pypi.simple.v1+json"):
         data = json.loads(page.content)
         project_track_urls = set(data.get("meta", {}).get("tracks", []))
-        # repo_alt_urls = set(data.get("alternate-locations", []))
-        # repo_alt_urls.add(page.url)
         repo_alt_urls = set(data.get("alternate-locations", []))
+        repo_alt_urls.add(page.url)
         for file in data.get("files", []):
             link = Link.from_json(
                 file,
@@ -252,9 +251,8 @@ def parse_links(page: IndexContent) -> Iterable[Link]:
 
     base_url = parser.base_url or url
     for anchor in parser.anchors:
-        # repo_alt_urls = parser.repo_alt_urls or set()
-        # repo_alt_urls.add(page.url)
         repo_alt_urls = parser.repo_alt_urls or set()
+        repo_alt_urls.add(page.url)
         link = Link.from_element(
             anchor,
             page_url=url,

src/pip/_internal/index/package_finder.py

@@ -1385,7 +1385,7 @@ def check_multiple_remote_repositories(
         if not any(ns & other for j, other in enumerate(namespaces) if i != j):
             raise UnsafeMultipleRemoteRepositories(
                 package=project_name,
-                remote_repositories=ns,
+                remote_repositories={u for u in ns if u is not None},
             )
 
     all_declared_sources = set().union(*namespaces)
@@ -1394,7 +1394,7 @@ def check_multiple_remote_repositories(
     if invalid_sources:
         raise UnsafeMultipleRemoteRepositories(
             package=project_name,
-            remote_repositories=invalid_sources,
+            remote_repositories={u for u in invalid_sources if u is not None},
         )
 
     return None

tests/unit/test_index.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import logging
-from typing import Set
 
 import pytest
+from _pytest.logging import LogCaptureFixture
 
 from pip._vendor.packaging.specifiers import SpecifierSet
 from pip._vendor.packaging.tags import Tag
@@ -919,8 +919,8 @@ def _make_mock_candidate_check_remote_repo(
     candidate_name: str | None = None,
     version: str | None = None,
     comes_from_url: str | None = None,
-    project_track_urls: Set[str] | None = None,
-    repo_alt_urls: Set[str] | None = None,
+    project_track_urls: set[str] | None = None,
+    repo_alt_urls: set[str] | None = None,
 ) -> InstallationCandidate:
     if candidate_name is None:
         candidate_name = "mypackage"
@@ -1088,7 +1088,10 @@ def _make_mock_candidate_check_remote_repo(
     ],
 )
 def test_check_multiple_remote_repositories(
-    caplog, candidates: list[InstallationCandidate], project_name: str, expected
+    caplog: LogCaptureFixture,
+    candidates: list[InstallationCandidate],
+    project_name: str,
+    expected: Type[Exception] | None,
 ) -> None:
     caplog.set_level(logging.DEBUG)
     if expected: