Use backend_registry for name of singleton instance

Author: ianthomas23

lib/matplotlib/backend_bases.py

@@ -105,8 +105,8 @@ def _safe_pyplot_import():
         if current_framework is None:
             raise  # No, something else went wrong, likely with the install...
 
-        from matplotlib.backends.registry import backendRegistry
-        backend = backendRegistry.framework_to_backend(current_framework)
+        from matplotlib.backends.registry import backend_registry
+        backend = backend_registry.framework_to_backend(current_framework)
         if backend is None:
             raise KeyError(backend)
 

lib/matplotlib/backends/registry.py

@@ -58,4 +58,4 @@ def list_builtin(self, filter_=None):
 
 
 # Singleton
-backendRegistry = BackendRegistry()
+backend_registry = BackendRegistry()

lib/matplotlib/backends/registry.pyi

@@ -13,4 +13,4 @@ class BackendRegistry:
     def list_builtin(self, filter_: BackendFilter | None) -> list[str]: ...
 
 
-backendRegistry: BackendRegistry
+backend_registry: BackendRegistry

lib/matplotlib/pyplot.py

@@ -304,7 +304,7 @@ def switch_backend(newbackend: str) -> None:
         current_framework = cbook._get_running_interactive_framework()
 
         if (current_framework and
-                (backend := backendRegistry.framework_to_backend(current_framework))):
+                (backend := backend_registry.framework_to_backend(current_framework))):
             candidates = [backend]
         else:
             candidates = []
@@ -2505,7 +2505,7 @@ def polar(*args, **kwargs) -> list[Line2D]:
 # is compatible with the current running interactive framework.
 if (rcParams["backend_fallback"]
         and rcParams._get_backend_or_none() in (  # type: ignore
-            set(backendRegistry.list_builtin(BackendFilter.INTERACTIVE_NON_WEB)))
+            set(backend_registry.list_builtin(BackendFilter.INTERACTIVE_NON_WEB)))
         and cbook._get_running_interactive_framework()):  # type: ignore
     rcParams._set("backend", rcsetup._auto_backend_sentinel)  # type: ignore
 

lib/matplotlib/rcsetup.py

@@ -23,7 +23,7 @@
 import numpy as np
 
 from matplotlib import _api, cbook
-from matplotlib.backends.registry import BackendFilter, backendRegistry
+from matplotlib.backends.registry import BackendFilter, backend_registry
 from matplotlib.cbook import ls_mapper
 from matplotlib.colors import Colormap, is_color_like
 from matplotlib._fontconfig_pattern import parse_fontconfig_pattern
@@ -34,10 +34,10 @@
 
 
 # Deprecation of module-level attributes using PEP 562
-_deprecated_interactive_bk = backendRegistry.list_builtin(BackendFilter.INTERACTIVE)
-_deprecated_non_interactive_bk = backendRegistry.list_builtin(
+_deprecated_interactive_bk = backend_registry.list_builtin(BackendFilter.INTERACTIVE)
+_deprecated_non_interactive_bk = backend_registry.list_builtin(
     BackendFilter.NON_INTERACTIVE)
-_deprecated_all_backends = backendRegistry.list_builtin()
+_deprecated_all_backends = backend_registry.list_builtin()
 
 _deprecated_names_and_args = {
     "interactive_bk": "matplotlib.backends.registry.BackendFilter.INTERACTIVE",
@@ -52,7 +52,7 @@ def __getattr__(name):
         _api.warn_deprecated(
             "3.9.0",
             name=name,
-            alternative="``matplotlib.backends.registry.backendRegistry"
+            alternative="``matplotlib.backends.registry.backend_registry"
                 f".list_builtin({arg})``",
         )
         return globals()[f"_deprecated_{name}"]
@@ -271,7 +271,7 @@ def validate_fonttype(s):
 
 
 _validate_standard_backends = ValidateInStrings(
-    'backend', backendRegistry.list_builtin(), ignorecase=True)
+    'backend', backend_registry.list_builtin(), ignorecase=True)
 _auto_backend_sentinel = object()
 
 

lib/matplotlib/tests/test_backend_registry.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from matplotlib.backends.registry import BackendFilter, backendRegistry
+from matplotlib.backends.registry import BackendFilter, backend_registry
 
 
 def has_duplicates(seq: Sequence[Any]) -> bool:
@@ -24,11 +24,11 @@ def has_duplicates(seq: Sequence[Any]) -> bool:
     ]
 )
 def test_framework_to_backend(framework, expected):
-    assert backendRegistry.framework_to_backend(framework) == expected
+    assert backend_registry.framework_to_backend(framework) == expected
 
 
 def test_list_builtin():
-    backends = backendRegistry.list_builtin()
+    backends = backend_registry.list_builtin()
     assert not has_duplicates(backends)
     # Compare using sets as order is not important
     assert set(backends) == set((
@@ -53,7 +53,7 @@ def test_list_builtin():
     ]
 )
 def test_list_builtin_with_filter(filter, expected):
-    backends = backendRegistry.list_builtin(filter)
+    backends = backend_registry.list_builtin(filter)
     assert not has_duplicates(backends)
     # Compare using sets as order is not important
     assert set(backends) == set(expected)

lib/matplotlib/tests/test_matplotlib.py

@@ -57,12 +57,12 @@ def parse(key):
             backends += [e.strip() for e in line.split(',') if e]
         return backends
 
-    from matplotlib.backends.registry import BackendFilter, backendRegistry
+    from matplotlib.backends.registry import BackendFilter, backend_registry
 
     assert (set(parse('- interactive backends:\n')) ==
-            set(backendRegistry.list_builtin(BackendFilter.INTERACTIVE)))
+            set(backend_registry.list_builtin(BackendFilter.INTERACTIVE)))
     assert (set(parse('- non-interactive backends:\n')) ==
-            set(backendRegistry.list_builtin(BackendFilter.NON_INTERACTIVE)))
+            set(backend_registry.list_builtin(BackendFilter.NON_INTERACTIVE)))
 
 
 def test_importable_with__OO():