8000 Import BackendFilter and backend_registry into · matplotlib/matplotlib@8f10a01 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f10a01

Browse files
ianthomas23ianthomas23
committed
Import BackendFilter and backend_registry into
matplotlib.backends.__init__.py
1 parent 9a9dda4 commit 8f10a01

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

‎doc/api/next_api_changes/deprecations/27719-IT.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
``rcsetup.interactive_bk``, ``rcsetup.non_interactive_bk`` and ``rcsetup.all_backends``
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33

4-
... are deprecated and replaced by
5-
:meth:`matplotlib.backends.registry.BackendRegistry.list_builtin`
4+
... are deprecated and replaced by ``matplotlib.backends.backend_registry.list_builtin``
65
with the following arguments
76

8-
- `matplotlib.backends.registry.BackendFilter.INTERACTIVE`
9-
- `matplotlib.backends.registry.BackendFilter.NON_INTERACTIVE`
7+
- ``matplotlib.backends.BackendFilter.INTERACTIVE``
8+
- ``matplotlib.backends.BackendFilter.NON_INTERACTIVE``
109
- ``None``
1110

1211
respectively.

‎doc/users/next_whats_new/backend_registry.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ BackendRegistry
33

44
New :class:`~matplotlib.backends.registry.BackendRegistry` class is the single
55
source of truth for available backends. The singleton instance is
6-
``matplotlib.backends.registry.backend_registry``.
6+
``matplotlib.backends.backend_registry``.

‎lib/matplotlib/backend_bases.py

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

108-
from matplotlib.backends.registry import backend_registry
108+
from matplotlib.backends import backend_registry
109109
backend = backend_registry.backend_for_gui_framework(current_framework)
110110
if backend is None:
111111
raise RuntimeError("No suitable backend for the current GUI framework "

‎lib/matplotlib/backends/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from .registry import BackendFilter, backend_registry # noqa: F401
2+
13
# NOTE: plt.switch_backend() (called at import time) will add a "backend"
24
# attribute here for backcompat.
35
_QT_FORCE_QT5_BINDING = False

‎lib/matplotlib/backends/registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class BackendRegistry:
1818
This is the single source of truth for available backends.
1919
2020
All use of ``BackendRegistry`` should be via the singleton instance
21-
``backend_registry``.
21+
``backend_registry`` which can be imported from ``matplotlib.backends``.
2222
2323
.. versionadded:: 3.9
2424
"""

‎lib/matplotlib/pyplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
from matplotlib.artist import Artist
7070
from matplotlib.axes import Axes
7171
from matplotlib.axes import Subplot # noqa: F401
72-
from matplotlib.backends.registry import BackendFilter, backend_registry
72+
from matplotlib.backends import BackendFilter, backend_registry
7373
from matplotlib.projections import PolarAxes # type: ignore
7474
from matplotlib import mlab # for detrend_none, window_hanning
7575
from matplotlib.scale import get_scale_names # noqa: F401

‎lib/matplotlib/rcsetup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import numpy as np
2424

2525
from matplotlib import _api, cbook
26-
from matplotlib.backends.registry import BackendFilter, backend_registry
26+
from matplotlib.backends import BackendFilter, backend_registry
2727
from matplotlib.cbook import ls_mapper
2828
from matplotlib.colors import Colormap, is_color_like
2929
from matplotlib._fontconfig_pattern import parse_fontconfig_pattern
@@ -37,23 +37,23 @@
3737
class __getattr__:
3838
@_api.deprecated(
3939
"3.9",
40-
alternative="``matplotlib.backends.registry.backend_registry.list_builtin"
41-
"(matplotlib.backends.registry.BackendFilter.INTERACTIVE)``")
40+
alternative="``matplotlib.backends.backend_registry.list_builtin"
41+
"(matplotlib.backends.BackendFilter.INTERACTIVE)``")
4242
@property
4343
def interactive_bk(self):
4444
return backend_registry.list_builtin(BackendFilter.INTERACTIVE)
4545

4646
@_api.deprecated(
4747
"3.9",
48-
alternative="``matplotlib.backends.registry.backend_registry.list_builtin"
49-
"(matplotlib.backends.registry.BackendFilter.NON_INTERACTIVE)``")
48+
alternative="``matplotlib.backends.backend_registry.list_builtin"
49+
"(matplotlib.backends.BackendFilter.NON_INTERACTIVE)``")
5050
@property
5151
def non_interactive_bk(self):
5252
return backend_registry.list_builtin(BackendFilter.NON_INTERACTIVE)
5353

5454
@_api.deprecated(
5555
"3.9",
56-
alternative="``matplotlib.backends.registry.backend_registry.list_builtin()``")
56+
alternative="``matplotlib.backends.backend_registry.list_builtin()``")
5757
@property
5858
def all_backends(self):
5959
return backend_registry.list_builtin()

‎lib/matplotlib/tests/test_backend_registry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import pytest
55

66
import matplotlib as mpl
7-
from matplotlib.backends.registry import BackendFilter, backend_registry
7+
from matplotlib.backends import BackendFilter, backend_registry
88

99

1010
def has_duplicates(seq: Sequence[Any]) -> bool:

‎lib/matplotlib/tests/test_matplotlib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def parse(key):
5656
backends += [e.strip() for e in line.split(',') if e]
5757
return backends
5858

59-
from matplotlib.backends.registry import BackendFilter, backend_registry
59+
from matplotlib.backends import BackendFilter, backend_registry
6060

6161
assert (set(parse('- interactive backends:\n')) ==
6262
set(backend_registry.list_builtin(BackendFilter.INTERACTIVE)))

0 commit comments

Comments
 (0)
0