Use pathlib in texmanager.

anntzer · anntzer · commit 942e865becd4 · 2025-08-15T07:15:44.000+02:00
Only a few changes are needed.  Note that make_png returns an absolute
path so path joining is not even needed here.

Also drop an unrelated but outdated comment re: background handling,
which is obsolete since 8940c66 (look for `if hack: ...`).
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -23,7 +23,6 @@
 import functools
 import hashlib
 import logging
-import os
 from pathlib import Path
 import subprocess
 from tempfile import TemporaryDirectory
@@ -63,7 +62,7 @@ class TexManager:
     Repeated calls to this constructor always return the same instance.
     """
 
-    _texcache = os.path.join(mpl.get_cachedir(), 'tex.cache')
+    _cache_dir = Path(mpl.get_cachedir(), 'tex.cache')
     _grey_arrayd = {}
 
     _font_families = ('serif', 'sans-serif', 'cursive', 'monospace')
@@ -109,7 +108,7 @@ class TexManager:
 
     @functools.lru_cache  # Always return the same instance.
     def __new__(cls):
-        Path(cls._texcache).mkdir(parents=True, exist_ok=True)
+        cls._cache_dir.mkdir(parents=True, exist_ok=True)
         return object.__new__(cls)
 
     @classmethod
@@ -176,14 +175,14 @@ def get_basefile(cls, tex, fontsize, dpi=None):
             src.encode('utf-8'),
             usedforsecurity=False
         ).hexdigest()
-        filepath = Path(cls._texcache)
+        filepath = cls._cache_dir
 
         num_letters, num_levels = 2, 2
         for i in range(0, num_letters*num_levels, num_letters):
-            filepath = filepath / Path(filehash[i:i+2])
+            filepath = filepath / filehash[i:i+2]
 
         filepath.mkdir(parents=True, exist_ok=True)
-        return os.path.join(filepath, filehash)
+        return str(filepath / filehash)
 
     @classmethod
     def get_font_preamble(cls):
@@ -253,7 +252,7 @@ def _run_checked_subprocess(cls, command, tex, *, cwd=None):
         _log.debug(cbook._pformat_subprocess(command))
         try:
             report = subprocess.check_output(
-                command, cwd=cwd if cwd is not None else cls._texcache,
+                command, cwd=cwd if cwd is not None else cls._cache_dir,
                 stderr=subprocess.STDOUT)
         except FileNotFoundError as exc:
             raise RuntimeError(
@@ -312,7 +311,6 @@ def make_png(cls, tex, fontsize, dpi):
         Return the file name.
         """
         pngfile = Path(cls.get_basefile(tex, fontsize)).with_suffix(".png")
-        # see get_rgba for a discussion of the background
         if not pngfile.exists():
             dvifile = cls.make_dvi(tex, fontsize)
             with TemporaryDirectory(dir=pngfile.parent) as tmpdir:
@@ -338,7 +336,7 @@ def get_grey(cls, tex, fontsize=None, dpi=None):
         alpha = cls._grey_arrayd.get(key)
         if alpha is None:
             pngfile = cls.make_png(tex, fontsize, dpi)
-            rgba = mpl.image.imread(os.path.join(cls._texcache, pngfile))
+            rgba = mpl.image.imread(pngfile)
             cls._grey_arrayd[key] = alpha = rgba[:, :, -1]
         return alpha
 
