Commitd5f1d55

authored

Merge pull request#18214 from meeseeksmachine/auto-backport-of-pr-18184-on-v3.3.x

Backport PR#18184 on branch v3.3.x (Go back to checking figures for their manager in destroy.)

2 parents9908136 +0745b37 commitd5f1d55Copy full SHA for d5f1d55

File tree

+20

-5

lines changed

+20

-5

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,10 @@ def destroy(cls, num):`
`71`	`71`	`@classmethod`
`72`	`72`	`defdestroy_fig(cls,fig):`
`73`	`73`	`"""Destroy figure fig."""`
`74`		`-canvas=getattr(fig,"canvas",None)`
`75`		`-manager=getattr(canvas,"manager",None)`
`76`		`-cls.destroy(manager)`
	`74`	`+num=next((manager.numformanagerincls.figs.values()`
	`75`	`+ifmanager.canvas.figure==fig),None)`
	`76`	`+ifnumisnotNone:`
	`77`	`+cls.destroy(num)`
`77`	`78`
`78`	`79`	`@classmethod`
`79`	`80`	`defdestroy_all(cls):`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,15 @@ def test_get_default_filename(tmpdir):`
`60`	`60`	`assertfilename=='image.png'`
`61`	`61`
`62`	`62`
	`63`	`+deftest_canvas_change():`
	`64`	`+fig=plt.figure()`
	`65`	`+# Replaces fig.canvas`
	`66`	`+canvas=FigureCanvasBase(fig)`
	`67`	`+# Should still work.`
	`68`	`+plt.close(fig)`
	`69`	`+assertnotplt.fignum_exists(fig.number)`
	`70`	`+`
	`71`	`+`
`63`	`72`	`@pytest.mark.backend('pdf')`
`64`	`73`	`deftest_non_gui_warning(monkeypatch):`
`65`	`74`	`plt.subplots()`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,13 @@ def check_alt_backend(alt_backend):`
`146`	`146`	`@pytest.mark.parametrize("toolbar", ["toolbar2","toolmanager"])`
`147`	`147`	`@pytest.mark.flaky(reruns=3)`
`148`	`148`	`deftest_interactive_backend(backend,toolbar):`
`149`		`-ifbackend=="macosx"andtoolbar=="toolmanager":`
`150`		`-pytest.skip("toolmanager is not implemented for macosx.")`
	`149`	`+ifbackend=="macosx":`
	`150`	`+iftoolbar=="toolmanager":`
	`151`	`+pytest.skip("toolmanager is not implemented for macosx.")`
	`152`	`+iftoolbar=="toolbar2"andos.environ.get('TRAVIS'):`
	`153`	`+# See https://github.com/matplotlib/matplotlib/issues/18213`
	`154`	`+pytest.skip("toolbar2 for macosx is buggy on Travis.")`
	`155`	`+`
`151`	`156`	`proc=subprocess.run(`
`152`	`157`	`[sys.executable,"-c",_test_script,`
`153`	`158`	`json.dumps({"toolbar":toolbar})],`

Comments

(0)