Fix types in tests on Windows

Author: uranusjr

src/pip/_internal/req/req_install.py

@@ -390,10 +390,9 @@ def check_if_exists(self, use_user_site: bool) -> None:
                     existing_dist
                 ):
                     raise InstallationError(
-                        "Will not install to the user site because it will "
-                        "lack sys.path precedence to {} in {}".format(
-                            existing_dist.project_name, existing_dist.location
-                        )
+                        f"Will not install to the user site because it will "
+                        f"lack sys.path precedence to {existing_dist.raw_name} "
+                        f"in {existing_dist.location}"
                     )
             else:
                 self.should_reinstall = True

tests/unit/test_appdirs.py

@@ -73,7 +73,7 @@ def test_user_cache_dir_unicode(self, monkeypatch: pytest.MonkeyPatch) -> None:
         if sys.platform != "win32":
             return
 
-        def my_get_win_folder(csidl_name):
+        def my_get_win_folder(csidl_name: str) -> str:
             return "\u00DF\u00E4\u03B1\u20AC"
 
         monkeypatch.setattr(_appdirs, "_get_win_folder", my_get_win_folder)

tests/unit/test_locations.py

@@ -54,7 +54,7 @@ def patch(self) -> None:
         os.fstat = lambda fd: self.get_mock_fstat(fd)
 
         if sys.platform != "win32":
-            pwd.getpwuid = lambda uid: self.get_mock_getpwuid(uid)
+            pwd.getpwuid = self.get_mock_getpwuid
 
     def revert_patch(self) -> None:
         """revert the patches to python methods"""
@@ -74,7 +74,7 @@ def get_mock_fstat(self, fd: int) -> os.stat_result:
         result.st_uid = self.st_uid
         return result
 
-    def get_mock_getpwuid(self, uid: int) -> pwd.struct_passwd:
+    def get_mock_getpwuid(self, uid: int) -> Any:
         """returns a basic mock pwd.getpwuid call result.
         Currently only the pw_name attribute has been set.
         """

tests/unit/test_req.py

@@ -21,7 +21,7 @@
     PreviousBuildDirError,
 )
 from pip._internal.index.package_finder import PackageFinder
-from pip._internal.metadata import BaseDistribution
+from pip._internal.metadata.pkg_resources import Distribution
 from pip._internal.network.session import PipSession
 from pip._internal.operations.prepare import RequirementPreparer
 from pip._internal.req import InstallRequirement, RequirementSet
@@ -451,7 +451,7 @@ def test_get_dist(self, path: str) -> None:
         req = install_req_from_line("foo")
         req.metadata_directory = path
         dist = req.get_dist()
-        assert isinstance(dist, BaseDistribution)
+        assert isinstance(dist, Distribution)
         assert dist.raw_name == dist.canonical_name == "foo"
         assert dist.location == "/path/to".replace("/", os.path.sep)
 

tests/unit/test_req_uninstall.py

@@ -137,12 +137,12 @@ def test_add(self, tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> None:
             pass
 
         ups = UninstallPathSet(dist=Mock())
-        assert ups.paths == set()
+        assert ups._paths == set()
         ups.add(file_extant)
-        assert ups.paths == {file_extant}
+        assert ups._paths == {file_extant}
 
         ups.add(file_nonexistent)
-        assert ups.paths == {file_extant}
+        assert ups._paths == {file_extant}
 
     def test_add_pth(self, tmpdir: str, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(pip._internal.req.req_uninstall, "is_local", mock_is_local)
@@ -184,7 +184,7 @@ def test_add_symlink(self, tmpdir: Path, monkeypatch: pytest.MonkeyPatch) -> Non
 
         ups = UninstallPathSet(dist=Mock())
         ups.add(foo_link)
-        assert ups.paths == {foo_link}
+        assert ups._paths == {foo_link}
 
     def test_compact_shorter_path(self, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(pip._internal.req.req_uninstall, "is_local", mock_is_local)
@@ -196,7 +196,7 @@ def test_compact_shorter_path(self, monkeypatch: pytest.MonkeyPatch) -> None:
         ups = UninstallPathSet(dist=Mock())
         ups.add(short_path)
         ups.add(os.path.join(short_path, "longer"))
-        assert compact(ups.paths) == {short_path}
+        assert compact(ups._paths) == {short_path}
 
     @pytest.mark.skipif("sys.platform == 'win32'")
     def test_detect_symlink_dirs(
@@ -218,7 +218,7 @@ def test_detect_symlink_dirs(
         ups = UninstallPathSet(dist=Mock())
         ups.add(path1)
         ups.add(path2)
-        assert ups.paths == {path1}
+        assert ups._paths == {path1}
 
 
 class TestStashedUninstallPathSet: