Commit d5bbd1e

dopplershiftstory645

authored and

committed

Merge pull request matplotlib#15512 from tacaswell/fix_webagg_fallback

FIX: do not consider webagg and nbagg "interactive" for fallback

1 parent 0e9b8ea commit d5bbd1eCopy full SHA for d5bbd1e

File tree

-5

lines changed

-5

lines changed

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2341,14 +2341,9 @@ def getname_val(identifier):`
`2341`	`2341`	`# requested, ignore rcParams['backend'] and force selection of a backend that`
`2342`	`2342`	`# is compatible with the current running interactive framework.`
`2343`	`2343`	`if (rcParams["backend_fallback"]`
`2344`		`-<<<<<<< HEAD`
`2345`		`- and dict.__getitem__(rcParams, "backend") in _interactive_bk`
`2346`		`- and _get_running_interactive_framework()):`
`2347`		`-=======`
`2348`	`2344`	`and dict.__getitem__(rcParams, "backend") in (`
`2349`	`2345`	`set(_interactive_bk) - {'WebAgg', 'nbAgg'})`
`2350`	`2346`	`and cbook._get_running_interactive_framework()):`
`2351`		`->>>>>>> 126de7f92... Merge pull request #15512 from tacaswell/fix_webagg_fallback`
`2352`	`2347`	`dict.__setitem__(rcParams, "backend", rcsetup._auto_backend_sentinel)`
`2353`	`2348`	`# Set up the backend.`
`2354`	`2349`	`switch_backend(rcParams["backend"])`

Comments

(0)