Improve use of importlib.metadata.entry_points

ianthomas23 · ianthomas23 · commit 540f8d328064 · 2024-03-19T14:46:44.000Z
diff --git a/lib/matplotlib/backends/registry.py b/lib/matplotlib/backends/registry.py
@@ -132,9 +132,16 @@ def _read_entry_points(self):
         # format):
         #   [project.entry-points."matplotlib.backend"]
         #   inline = "matplotlib_inline.backend_inline"
-        import importlib_metadata as im
+        import importlib.metadata as im
+        import sys
+
+        # entry_points group keyword not available before Python 3.10
         group = "matplotlib.backend"
-        entries = [(entry.name, entry.value) for entry in im.entry_points(group=group)]
+        if sys.version_info >= (3, 10):
+            entry_points = im.entry_points(group=group)
+        else:
+            entry_points = im.entry_points().get(group, {})
+        entries = [(entry.name, entry.value) for entry in entry_points]
 
         # For backward compatibility, if matplotlib-inline and/or ipympl are installed
         # but too old to include entry points, create them. Do not import ipympl
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -413,7 +413,7 @@ def draw_if_interactive() -> None:
     if newbackend in ("ipympl", "widget"):
         # ipympl < 0.9.4 expects rcParams["backend"] to be the fully-qualified backend
         # name "module://ipympl.backend_nbagg" not short names "ipympl" or "widget".
-        import importlib_metadata as im
+        import importlib.metadata as im
         from matplotlib import _parse_to_version_info  # type: ignore[attr-defined]
         try:
             module_version = im.version("ipympl")
