MNT: Update lru_cache to cache where appropriate

greglucas · greglucas · commit 89c996d6f657 · 2023-01-16T21:42:04.000-07:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -231,7 +231,7 @@ def _check_versions():
 
 # The decorator ensures this always returns the same handler (and it is only
 # attached once).
-@functools.lru_cache
+@functools.cache
 def _ensure_handler():
     """
     The first time this function is called, attach a `StreamHandler` using the
@@ -321,7 +321,7 @@ class ExecutableNotFoundError(FileNotFoundError):
     pass
 
 
-@functools.lru_cache
+@functools.cache
 def _get_executable_info(name):
     """
     Get the version of some executable that Matplotlib optionally depends on.
@@ -799,7 +799,7 @@ def rc_params(fail_on_error=False):
     return rc_params_from_file(matplotlib_fname(), fail_on_error)
 
 
-@functools.lru_cache
+@functools.cache
 def _get_ssl_context():
     try:
         import certifi
diff --git a/lib/matplotlib/_api/__init__.py b/lib/matplotlib/_api/__init__.py
@@ -219,7 +219,7 @@ def name(self): ...
              if isinstance(prop, property)}
     instance = cls()
 
-    @functools.lru_cache(None)
+    @functools.cache
     def __getattr__(name):
         if name in props:
             return props[name].__get__(instance)
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -273,7 +273,7 @@ class TruetypeFonts(Fonts):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Per-instance cache.
-        self._get_info = functools.lru_cache(None)(self._get_info)
+        self._get_info = functools.cache(self._get_info)
         self._fonts = {}
 
         filename = findfont(self.default_font_prop)
@@ -752,7 +752,7 @@ def _map_virtual_font(self, fontname, font_class, uniindex):
 
         return fontname, uniindex
 
-    @functools.lru_cache
+    @functools.cache
     def get_sized_alternatives_for_symbol(self, fontname, sym):
         fixes = {
             '\\{': '{', '\\}': '}', '\\[': '[', '\\]': ']',
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1,6 +1,6 @@
 from collections import namedtuple
 import contextlib
-from functools import lru_cache, wraps
+from functools import cache, wraps
 import inspect
 from inspect import Signature, Parameter
 import logging
@@ -1538,13 +1538,13 @@ def get_setters(self):
         return setters
 
     @staticmethod
-    @lru_cache(maxsize=None)
+    @cache
     def number_of_parameters(func):
         """Return number of parameters of the callable *func*."""
         return len(inspect.signature(func).parameters)
 
     @staticmethod
-    @lru_cache(maxsize=None)
+    @cache
     def is_alias(method):
         """
         Return whether the object *method* is an alias for another method.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1695,12 +1695,12 @@ def __init__(self, figure=None):
     scroll_pick_id = property(lambda self: self.figure._scroll_pick_id)
 
     @classmethod
-    @functools.lru_cache
+    @functools.cache
     def _fix_ipython_backend2gui(cls):
         # Fix hard-coded module -> toolkit mapping in IPython (used for
         # `ipython --auto`).  This cannot be done at import time due to
         # ordering issues, so we do it when creating a canvas, and should only
-        # be done once per class (hence the `lru_cache(1)`).
+        # be done once per class (hence the `cache`).
         if sys.modules.get("IPython") is None:
             return
         import IPython
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -289,7 +289,7 @@ def __init__(self, width, height, pswriter, imagedpi=72):
         self._path_collection_id = 0
 
         self._character_tracker = _backend_pdf_ps.CharacterTracker()
-        self._logwarn_once = functools.lru_cache(None)(_log.warning)
+        self._logwarn_once = functools.cache(_log.warning)
 
     def _is_transparent(self, rgb_or_rgba):
         if rgb_or_rgba is None:
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -158,7 +158,7 @@ def _isdeleted(obj):
 # PyQt6 enum compat helpers.
 
 
-@functools.lru_cache(None)
+@functools.cache
 def _enum(name):
     # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
     return operator.attrgetter(
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2178,7 +2178,7 @@ def _unikey_or_keysym_to_mplkey(unikey, keysym):
     return key
 
 
-@functools.lru_cache(None)
+@functools.cache
 def _make_class_factory(mixin_class, fmt, attr_name=None):
     """
     Return a function that creates picklable classes inheriting from a mixin.
@@ -2197,7 +2197,7 @@ def _make_class_factory(mixin_class, fmt, attr_name=None):
     ``Axes`` class always return the same subclass.
     """
 
-    @functools.lru_cache(None)
+    @functools.cache
     def class_factory(axes_class):
         # if we have already wrapped this class, declare victory!
         if issubclass(axes_class, mixin_class):
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1623,7 +1623,7 @@ def init(vmin=None, vmax=None, clip=False): pass
         base_norm_cls, inspect.signature(init))
 
 
-@functools.lru_cache(None)
+@functools.cache
 def _make_norm_from_scale(
     scale_cls, scale_args, scale_kwargs_items,
     base_norm_cls, bound_init_signature,
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -339,7 +339,7 @@ def _clean_conversion_cache():
             path.unlink()
 
 
-@functools.lru_cache  # Ensure this is only registered once.
+@functools.cache  # Ensure this is only registered once.
 def _register_conversion_cache_cleaner_once():
     atexit.register(_clean_conversion_cache)
 
diff --git a/setupext.py b/setupext.py
@@ -43,7 +43,7 @@ def _get_hash(data):
     return hasher.hexdigest()
 
 
-@functools.lru_cache
+@functools.cache
 def _get_ssl_context():
     import certifi
     import ssl
@@ -229,7 +229,7 @@ def print_status(package, status):
                             subsequent_indent=indent))
 
 
-@functools.lru_cache(1)  # We only need to compute this once.
+@functools.cache  # We only need to compute this once.
 def get_pkg_config():
     """
     Get path to pkg-config and set up the PKG_CONFIG environment variable.
