FIX: do not raise in lru_cached function

tacaswell · tacaswell · commit 36725ed94026 · 2022-08-31T20:52:07.000-04:00
If the cached function raises it will not be cached and we will continuously
pay for cache misses.
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -1345,9 +1345,12 @@ def findfont(self, prop, fontext='ttf', directory=None,
         rc_params = tuple(tuple(mpl.rcParams[key]) for key in [
             "font.serif", "font.sans-serif", "font.cursive", "font.fantasy",
             "font.monospace"])
-        return self._findfont_cached(
+        ret = self._findfont_cached(
             prop, fontext, directory, fallback_to_default, rebuild_if_missing,
             rc_params)
+        if isinstance(ret, Exception):
+            raise ret
+        return ret
 
     def get_font_names(self):
         """Return the list of available fonts."""
@@ -1443,7 +1446,6 @@ def _find_fonts_by_props(self, prop, fontext='ttf', directory=None,
                 except ValueError:
                     _log.warning("findfont: Font family %r not found.", family)
 
-
         # only add default family if no other font was found and
         # fallback_to_default is enabled
         if not fpaths:
@@ -1517,8 +1519,9 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                 return self.findfont(default_prop, fontext, directory,
                                      fallback_to_default=False)
             else:
-                raise ValueError(f"Failed to find font {prop}, and fallback "
-                                 f"to the default font was disabled")
+                # yes return, exceptions are not cached
+                return ValueError(f"Failed to find font {prop}, and fallback "
+                                  f"to the default font was disabled")
         else:
             _log.debug('findfont: Matching %s to %s (%r) with score of %f.',
                        prop, best_font.name, best_font.fname, best_score)
@@ -1537,7 +1540,8 @@ def _findfont_cached(self, prop, fontext, directory, fallback_to_default,
                 return self.findfont(
                     prop, fontext, directory, rebuild_if_missing=False)
             else:
-                raise ValueError("No valid font could be found")
+                # yes return, exceptions are not cached
+                return ValueError("No valid font could be found")
 
         return _cached_realpath(result)
 
