Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions lib/matplotlib/_pylab_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,14 @@ def destroy(cls, num):
@classmethod
def destroy_fig(cls, fig):
"""Destroy figure *fig*."""
num = next((manager.num for manager in cls.figs.values()
if manager.canvas.figure == fig), None)
num = next(
(
manager.num
for manager in cls.figs.values()
if manager.canvas.figure == fig
),
None,
)
if num is not None:
cls.destroy(num)

Expand Down Expand Up @@ -106,7 +112,8 @@ def _set_new_active_manager(cls, manager):
"""Adopt *manager* into pyplot and make it the active manager."""
if not hasattr(manager, "_cidgcf"):
manager._cidgcf = manager.canvas.mpl_connect(
"button_press_event", lambda event: cls.set_active(manager))
"button_press_event", lambda event: cls.set_active(manager)
)
fig = manager.canvas.figure
fig.number = manager.num
label = fig.get_label()
Expand Down
10 changes: 9 additions & 1 deletion lib/matplotlib/pyplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
from matplotlib.colors import _color_sequences, Colormap

import numpy as np
import matplotlib.backends

if TYPE_CHECKING:
from collections.abc import Callable, Hashable, Iterable, Sequence
Expand Down Expand Up @@ -1088,7 +1089,7 @@ def fignum_exists(num: int | str) -> bool:
return (
_pylab_helpers.Gcf.has_fignum(num)
if isinstance(num, int)
else num in get_figlabels()
else num in _figlabels_set()
)


Expand Down Expand Up @@ -4492,3 +4493,10 @@ def nipy_spectral() -> None:
image if there is one. See ``help(colormaps)`` for more information.
"""
set_cmap("nipy_spectral")


def _figlabels_set() -> set[Any]:
"""Helper for fast membership check of string figure labels."""
return {
m.canvas.figure.get_label() for m in _pylab_helpers.Gcf.get_all_fig_managers()
}