8000 Review comments · ianthomas23/matplotlib@9a952c1 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9a952c1

Browse files
committed
Review comments
1 parent c20c0ac commit 9a952c1

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

lib/matplotlib/backend_bases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _safe_pyplot_import():
106106
raise # No, something else went wrong, likely with the install...
107107

108108
from matplotlib.backends.registry import backend_registry
109-
backend = backend_registry.framework_to_backend(current_framework)
109+
backend = backend_registry.backend_for_gui_framework(current_framework)
110110
if backend is None:
111111
raise KeyError(backend)
112112

lib/matplotlib/backends/registry.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class BackendRegistry:
3131
_BUILTIN_NOT_INTERACTIVE = [
3232
"agg", "cairo", "pdf", "pgf", "ps", "svg", "template",
3333
]
34-
_FRAMEWORK_TO_BACKEND_MAPPING = {
34+
_GUI_FRAMEWORK_TO_BACKEND_MAPPING = {
3535
"qt": "qtagg",
3636
"gtk3": "gtk3agg",
3737
"gtk4": "gtk4agg",
@@ -41,8 +41,8 @@ class BackendRegistry:
4141
"headless": "agg",
4242
}
4343

44-
def framework_to_backend(self, interactive_framework):
45-
return self._FRAMEWORK_TO_BACKEND_MAPPING.get(interactive_framework)
44+
def backend_for_gui_framework(self, framework):
45+
return self._GUI_FRAMEWORK_TO_BACKEND_MAPPING.get(framework)
4646

4747
def list_builtin(self, filter_=None):
4848
if filter_ == BackendFilter.INTERACTIVE:

lib/matplotlib/backends/registry.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class BackendFilter(Enum):
99

1010
class BackendRegistry:
1111
def __init__(self) -> None: ...
12-
def framework_to_backend(self, interactive_framework: str) -> str | None: ...
12+
def backend_for_gui_framework(self, interactive_framework: str) -> str | None: ...
1313
def list_builtin(self, filter_: BackendFilter | None) -> list[str]: ...
1414

1515

lib/matplotlib/pyplot.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ def switch_backend(newbackend: str) -> None:
304304
current_framework = cbook._get_running_interactive_framework()
305305

306306
if (current_framework and
307-
(backend := backend_registry.framework_to_backend(current_framework))):
307+
(backend := backend_registry.backend_for_gui_framework(
308+
current_framework))):
308309
candidates = [backend]
309310
else:
310311
candidates = []
@@ -2505,7 +2506,7 @@ def polar(*args, **kwargs) -> list[Line2D]:
25052506
# is compatible with the current running interactive framework.
25062507
if (rcParams["backend_fallback"]
25072508
and rcParams._get_backend_or_none() in ( # type: ignore
2508-
set(backend_registry.list_builtin(BackendFilter.INTERACTIVE_NON_WEB)))
2509+
backend_registry.list_builtin(BackendFilter.INTERACTIVE_NON_WEB))
25092510
and cbook._get_running_interactive_framework()): # type: ignore
25102511
rcParams._set("backend", rcsetup._auto_backend_sentinel) # type: ignore
25112512

lib/matplotlib/tests/test_backend_registry.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def has_duplicates(seq: Sequence[Any]) -> bool:
2323
('does not exist', None),
2424
]
2525
)
26-
def test_framework_to_backend(framework, expected):
27-
assert backend_registry.framework_to_backend(framework) == expected
26+
def test_backend_for_gui_framework(framework, expected):
27+
assert backend_registry.backend_for_gui_framework(framework) == expected
2828

2929

3030
def test_list_builtin():

0 commit comments

Comments
 (0)
0