Merge pull request #2849 from tipabu/logging-interpolation

Fix debug logging interpolation

Author: gaborbernat

src/virtualenv/app_data/via_disk_folder.py

@@ -108,10 +108,9 @@ def wheel_image(self, for_py_version, name):
 
 
 class JSONStoreDisk(ContentStore, ABC):
-    def __init__(self, in_folder, key, msg, msg_args) -> None:
+    def __init__(self, in_folder, key, msg_args) -> None:
         self.in_folder = in_folder
         self.key = key
-        self.msg = msg
         self.msg_args = (*msg_args, self.file)
 
     @property
@@ -130,7 +129,7 @@ def read(self):
         except Exception:  # noqa: BLE001, S110
             pass
         else:
-            LOGGER.debug("got %s from %s", self.msg, self.msg_args)
+            LOGGER.debug("got %s %s from %s", *self.msg_args)
             return data
         if bad_format:
             with suppress(OSError):  # reading and writing on the same file may cause race on multiple processes
@@ -139,7 +138,7 @@ def read(self):
 
     def remove(self):
         self.file.unlink()
-        LOGGER.debug("removed %s at %s", self.msg, self.msg_args)
+        LOGGER.debug("removed %s %s at %s", *self.msg_args)
 
     @contextmanager
     def locked(self):
@@ -150,22 +149,21 @@ def write(self, content):
         folder = self.file.parent
         folder.mkdir(parents=True, exist_ok=True)
         self.file.write_text(json.dumps(content, sort_keys=True, indent=2), encoding="utf-8")
-        LOGGER.debug("wrote %s at %s", self.msg, self.msg_args)
+        LOGGER.debug("wrote %s %s at %s", *self.msg_args)
 
 
 class PyInfoStoreDisk(JSONStoreDisk):
     def __init__(self, in_folder, path) -> None:
         key = sha256(str(path).encode("utf-8")).hexdigest()
-        super().__init__(in_folder, key, "python info of %s", (path,))
+        super().__init__(in_folder, key, ("python info of", path))
 
 
 class EmbedDistributionUpdateStoreDisk(JSONStoreDisk):
     def __init__(self, in_folder, distribution) -> None:
         super().__init__(
             in_folder,
             distribution,
-            "embed update of distribution %s",
-            (distribution,),
+            ("embed update of distribution", distribution),
         )