Commitfa92cf9

authored

Merge pull request#25870 from turnipseason/bug-fix-for-issue-23770

Adds error handling around install_repl_displayhook

2 parents8ac84ec +321b769 commitfa92cf9Copy full SHA for fa92cf9

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,11 @@ def draw_if_interactive() -> None:`
`520`	`520`	`matplotlib.backends.backend=newbackend# type: ignore[attr-defined]`
`521`	`521`
`522`	`522`	`# Make sure the repl display hook is installed in case we become interactive.`
`523`		`-install_repl_displayhook()`
	`523`	`+try:`
	`524`	`+install_repl_displayhook()`
	`525`	`+exceptNotImplementedErroraserr:`
	`526`	`+_log.warning("Fallback to a different backend")`
	`527`	`+raiseImportErrorfromerr`
`524`	`528`
`525`	`529`
`526`	`530`	`def_warn_if_gui_out_of_main_thread()->None:`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,21 @@ def test_blitting_events(env):`
`629`	`629`	`assert0<ndraws<5`
`630`	`630`
`631`	`631`
	`632`	`+def_fallback_check():`
	`633`	`+importIPython.core.interactiveshellasipsh`
	`634`	`+importmatplotlib.pyplot`
	`635`	`+ipsh.InteractiveShell.instance()`
	`636`	`+matplotlib.pyplot.figure()`
	`637`	`+`
	`638`	`+`
	`639`	`+deftest_fallback_to_different_backend():`
	`640`	`+pytest.importorskip("IPython")`
	`641`	`+# Runs the process that caused the GH issue 23770`
	`642`	`+# making sure that this doesn't crash`
	`643`	`+# since we're supposed to be switching to a different backend instead.`
	`644`	`+response=_run_helper(_fallback_check,timeout=_test_timeout)`
	`645`	`+`
	`646`	`+`
`632`	`647`	`def_impl_test_interactive_timers():`
`633`	`648`	`# A timer with <1 millisecond gets converted to int and therefore 0`
`634`	`649`	`# milliseconds, which the mac framework interprets as singleshot.`

Comments

(0)