Move the remaining test os.path calls to pathlib

The three os.path.abspath assertions in test_find_nvidia_binaries.py become
str(...absolute()), and the os.path.isdir in test_utils_find_sub_dirs.py
becomes Path.is_dir(). import os stays in the binaries test for os.sep.

Author: LeSingh1

cuda_pathfinder/cuda/pathfinder/_binaries/find_nvidia_binary_utility.py

@@ -77,7 +77,7 @@ def _resolve_ctk_root_via_canary() -> str | None:
     return ctk_root
 
 
-def _resolve_in_trusted_dirs(normalized_name: str, dirs: list[Path]) -> str | None:
+def _resolve_in_trusted_dirs(normalized_name: str, dirs: list[Path]) -> Path | None:
     """Resolve ``normalized_name`` against ``dirs`` in order."""
     seen: set[Path] = set()
     for directory in dirs:
@@ -92,7 +92,7 @@ def _resolve_in_trusted_dirs(normalized_name: str, dirs: list[Path]) -> str | No
             # search dir would otherwise leak a relative result). os.path.abspath
             # has no pathlib equivalent: Path.absolute() does not normalize and
             # Path.resolve() would also follow symlinks.
-            return os.path.abspath(candidate)
+            return Path(os.path.abspath(candidate))
     return None
 
 
@@ -213,7 +213,8 @@ def find_nvidia_binary_utility(utility_name: str) -> str | None:
         candidate_names = (f"{utility_name}.bat", normalized_name)
         found = _resolve_names_in_trusted_dirs(candidate_names, dirs)
     else:
-        found = _resolve_in_trusted_dirs(normalized_name, dirs)
+        resolved = _resolve_in_trusted_dirs(normalized_name, dirs)
+        found = None if resolved is None else str(resolved)
     if found is not None:
         return found
 
@@ -229,7 +230,8 @@ def find_nvidia_binary_utility(utility_name: str) -> str | None:
         if IS_WINDOWS and utility_name == "compute-sanitizer":
             found = _find_windows_compute_sanitizer(cuda_path)
         else:
-            found = _resolve_in_trusted_dirs(normalized_name, _ctk_bin_subdirs(cuda_path))
+            resolved = _resolve_in_trusted_dirs(normalized_name, _ctk_bin_subdirs(Path(cuda_path)))
+            found = None if resolved is None else str(resolved)
         if found is not None:
             return found
 
@@ -238,5 +240,6 @@ def find_nvidia_binary_utility(utility_name: str) -> str | None:
     if ctk_root is not None:
         if IS_WINDOWS and utility_name == "compute-sanitizer":
             return _find_windows_compute_sanitizer(ctk_root)
-        return _resolve_in_trusted_dirs(normalized_name, _ctk_bin_subdirs(Path(ctk_root)))
+        resolved = _resolve_in_trusted_dirs(normalized_name, _ctk_bin_subdirs(Path(ctk_root)))
+        return None if resolved is None else str(resolved)
     return None

cuda_pathfinder/tests/test_find_nvidia_binaries.py

@@ -403,7 +403,7 @@ def test_find_binary_first_matching_dir_wins(monkeypatch, mocker):
     result = find_nvidia_binary_utility("nvcc")
 
     # Conda comes before CUDA_HOME, so the Conda hit wins and CUDA_HOME is never probed.
-    assert result == os.path.abspath(conda_nvcc)
+    assert result == str(conda_nvcc.absolute())
     assert checked == [site_dir / "nvcc", conda_nvcc]
 
 
@@ -424,7 +424,7 @@ def test_find_binary_ctk_root_canary_fallback(monkeypatch, mocker):
 
     result = find_nvidia_binary_utility("nvcc")
 
-    assert result == os.path.abspath(ctk_nvcc)
+    assert result == str(ctk_nvcc.absolute())
     canary_mock.assert_called_once_with()
     # No earlier trusted dirs existed, so the only probe is the canary bin dir.
     assert checked == [ctk_nvcc]
@@ -469,7 +469,7 @@ def test_find_binary_canary_not_consulted_when_found_earlier(monkeypatch, mocker
 
     result = find_nvidia_binary_utility("nvcc")
 
-    assert result == os.path.abspath(conda_nvcc)
+    assert result == str(conda_nvcc.absolute())
     canary_mock.assert_not_called()