This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit cf4d812

authored

Merge pull request matplotlib#23742 from tacaswell/fix_ipympl

FIX: unbreak ipympl

2 parents 4355c4a + d791465 commit cf4d812Copy full SHA for cf4d812

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`
`32`	`32`	`import matplotlib as mpl`
`33`		`-from matplotlib.backends.backend_webagg_core import (`
	`33`	`+from matplotlib.backends.backend_webagg import (`
`34`	`34`	`FigureManagerWebAgg, new_figure_manager_given_figure)`
`35`	`35`	`from matplotlib.figure import Figure`
`36`	`36`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,9 @@ def set_history_buttons(self):`
`427`	`427`
`428`	`428`
`429`	`429`	`class FigureManagerWebAgg(backend_bases.FigureManagerBase):`
`430`		`- _toolbar2_class = ToolbarCls = NavigationToolbar2WebAgg`
	`430`	`+ # This must be None to not break ipympl`
	`431`	`+ _toolbar2_class = None`
	`432`	`+ ToolbarCls = NavigationToolbar2WebAgg`
`431`	`433`
`432`	`434`	`def __init__(self, canvas, num):`
`433`	`435`	`self.web_sockets = set()`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`import os`
`3`	`3`	`import sys`
`4`	`4`	`import pytest`
	`5`	`+import matplotlib.backends.backend_webagg_core`
`5`	`6`
`6`	`7`
`7`	`8`	`@pytest.mark.parametrize("backend", ["webagg", "nbagg"])`
`@@ -25,3 +26,8 @@ def test_webagg_fallback(backend):`
`25`	`26`	`ret = subprocess.call([sys.executable, "-c", test_code], env=env)`
`26`	`27`
`27`	`28`	`assert ret == 0`
	`29`	`+`
	`30`	`+`
	`31`	`+def test_webagg_core_no_toolbar():`
	`32`	`+ fm = matplotlib.backends.backend_webagg_core.FigureManagerWebAgg`
	`33`	`+ assert fm._toolbar2_class is None`

Comments

(0)