feat: Remove references to py_info from FileCache (#2948)

Author: esafak

docs/changelog/2074b.feature.rst

@@ -0,0 +1 @@
+Remove references to py_info in FileCache - by :user:`esafak`.

src/virtualenv/cache/file_cache.py

@@ -1,44 +1,45 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Callable
 
-from virtualenv.app_data.na import AppDataDisabled
 from virtualenv.cache import Cache
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from virtualenv.app_data.base import AppData
+    from virtualenv.app_data.base import ContentStore
 
 
 class FileCache(Cache):
-    def __init__(self, app_data: AppData) -> None:
-        self.app_data = app_data if app_data is not None else AppDataDisabled()
+    def __init__(self, store_factory: Callable[[Path], ContentStore], clearer: Callable[[], None] | None) -> None:
+        self.store_factory = store_factory
+        self.clearer = clearer
 
     def get(self, key: Path) -> dict | None:
         """Get a value from the file cache."""
-        py_info, py_info_store = None, self.app_data.py_info(key)
-        with py_info_store.locked():
-            if py_info_store.exists():
-                py_info = py_info_store.read()
-        return py_info
+        result, store = None, self.store_factory(key)
+        with store.locked():
+            if store.exists():
+                result = store.read()
+        return result
 
     def set(self, key: Path, value: dict) -> None:
         """Set a value in the file cache."""
-        py_info_store = self.app_data.py_info(key)
-        with py_info_store.locked():
-            py_info_store.write(value)
+        store = self.store_factory(key)
+        with store.locked():
+            store.write(value)
 
     def remove(self, key: Path) -> None:
         """Remove a value from the file cache."""
-        py_info_store = self.app_data.py_info(key)
-        with py_info_store.locked():
-            if py_info_store.exists():
-                py_info_store.remove()
+        store = self.store_factory(key)
+        with store.locked():
+            if store.exists():
+                store.remove()
 
     def clear(self) -> None:
         """Clear the entire file cache."""
-        self.app_data.py_info_clear()
+        if self.clearer is not None:
+            self.clearer()
 
 
 __all__ = [

src/virtualenv/discovery/cached_py_info.py

@@ -46,7 +46,9 @@ def from_exe(  # noqa: PLR0913
 ) -> PythonInfo | None:
     env = os.environ if env is None else env
     if cache is None:
-        cache = FileCache(app_data)
+        if app_data is None:
+            app_data = AppDataDisabled()
+        cache = FileCache(store_factory=app_data.py_info, clearer=app_data.py_info_clear)
     result = _get_from_cache(cls, app_data, exe, env, cache, ignore_cache=ignore_cache)
     if isinstance(result, Exception):
         if raise_on_error:
@@ -201,7 +203,7 @@ def __repr__(self) -> str:
 def clear(app_data=None, cache=None):
     """Clear the cache."""
     if cache is None and app_data is not None:
-        cache = FileCache(app_data)
+        cache = FileCache(store_factory=app_data.py_info, clearer=app_data.py_info_clear)
     if cache is not None:
         cache.clear()
     _CACHE.clear()