Use functools.cache for real_momoize

Author: dwoz

salt/utils/platform.py

@@ -12,7 +12,8 @@
 
 import distro
 
-# Use functools.lru_cache rather than importing from salt.utils.decorators.
+
+# Use a local wraps-based memoize rather than importing from salt.utils.decorators.
 # This module is synced to the remote's extmods/utils/platform.py, and in
 # Python 3.14+ (forkserver default start method) it can be accidentally
 # imported as the stdlib ``platform`` module when extmods/utils/ sits at
@@ -21,7 +22,26 @@
 #   salt.utils.decorators → salt.utils.versions → salt.version
 #   → import platform (ourselves!) → salt.utils.decorators  (cycle)
 # functools is part of the stdlib and has no such dependency.
-real_memoize = functools.cache
+#
+# We cannot use functools.cache/lru_cache directly as the decorator because
+# those produce functools._lru_cache_wrapper objects which fail
+# inspect.isfunction(), causing the Salt loader to skip them when loading
+# salt.utils.platform as a utils module (salt/loader/lazy.py line ~1109).
+def real_memoize(func):
+    """Cache the result of a zero-or-more-argument function (stdlib-only, loader-safe)."""
+    cache = {}
+    _sentinel = object()
+
+    @functools.wraps(func)
+    def _wrapper(*args, **kwargs):
+        key = (args, tuple(sorted(kwargs.items())))
+        result = cache.get(key, _sentinel)
+        if result is _sentinel:
+            result = func(*args, **kwargs)
+            cache[key] = result
+        return result
+
+    return _wrapper
 
 
 def linux_distribution(full_distribution_name=True):

tests/pytests/unit/loader/test_grains_cleanup.py

@@ -266,41 +266,41 @@ def test_clean_modules_removes_from_sys_modules(minion_opts):
         f"{loaded_base_name}.ext.{tag}",
     }
 
+    # Prefixes for modules that belong specifically to this loader's tag.
+    # clean_modules() only removes modules under these prefixes, so we only
+    # check these prefixes — not ALL salt.loaded.* modules.  Checking the
+    # broader namespace would make the test sensitive to modules loaded by
+    # other tests that ran in the same process (e.g. salt.loaded.int.modules.*
+    # from execution-module unit tests).
+    tag_prefixes = (
+        f"{loaded_base_name}.int.{tag}.",
+        f"{loaded_base_name}.ext.{tag}.",
+    )
+
     # Load some modules
     for key in list(loader.keys())[:5]:
         try:
             _ = loader[key]
         except Exception:  # pylint: disable=broad-except
             pass
 
-    # Find modules that were loaded
-    loaded_before = [m for m in sys.modules if m.startswith(loaded_base_name)]
+    # Find tag-specific modules that were loaded
+    loaded_before = [
+        m for m in sys.modules if any(m.startswith(p) for p in tag_prefixes)
+    ]
     assert len(loaded_before) > 0, "No modules were loaded for testing"
 
     # Clean modules
     loader.clean_modules()
 
-    # Verify actual loaded modules are removed but base stubs remain
-    remaining = [m for m in sys.modules if m.startswith(loaded_base_name)]
-
-    # All remaining modules should be base stubs or utils modules (shared infrastructure)
-    # Filter out both base stubs and utils modules
-    unexpected = []
-    for m in remaining:
-        # Skip base stubs
-        if m in expected_base_stubs:
-            continue
-        # Skip utils modules (shared infrastructure)
-        parts = m.split(".")
-        # Utils modules: salt.loaded.int.utils, salt.loaded.int.utils.*, etc.
-        if len(parts) >= 4 and parts[3] in ("utils", "wrapper"):
-            continue
-        # Anything else is unexpected
-        unexpected.append(m)
+    # All tag-specific modules should have been removed
+    remaining_tag = [
+        m for m in sys.modules if any(m.startswith(p) for p in tag_prefixes)
+    ]
 
     assert (
-        len(unexpected) == 0
-    ), f"clean_modules() failed to remove {len(unexpected)} modules: {unexpected}"
+        len(remaining_tag) == 0
+    ), f"clean_modules() failed to remove {len(remaining_tag)} modules: {remaining_tag}"
 
     # Base stubs should still be present
     for stub in expected_base_stubs: