Commit307c1ec

committed

Also update the backend when doing rcParams["backend"] = "foo".

1 parent2047ace commit307c1ecCopy full SHA for 307c1ec

File tree

+24

-10

lines changed

+24

-10

lines changed

Lines changed: 18 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,13 +262,28 @@ def validate_backend(s):`
`262`	`262`	`lambdas:`
`263`	`263`	`sifs.startswith("module://")`
`264`	`264`	`elseValidateInStrings('backend',all_backends,ignorecase=True)(s))(s)`
	`265`	`+pyplot=sys.modules.get("matplotlib.pyplot")`
`265`	`266`	`iflen(candidates)==1:`
`266`		`-returncandidates[0]`
	`267`	`+backend,=candidates`
	`268`	`+ifpyplot:`
	`269`	`+# This import needs to be delayed (below too) because it is not`
	`270`	`+# available at first import.`
	`271`	`+frommatplotlibimportrcParams`
	`272`	`+# Don't recurse.`
	`273`	`+old_backend=rcParams["backend"]`
	`274`	`+ifold_backend==backend:`
	`275`	`+returnbackend`
	`276`	`+dict.__setitem__(rcParams,"backend",backend)`
	`277`	`+try:`
	`278`	`+pyplot.switch_backend(backend)`
	`279`	`+exceptException:`
	`280`	`+dict.__setitem__(rcParams,"backend",old_backend)`
	`281`	`+raise`
	`282`	`+returnbackend`
`267`	`283`	`else:`
`268`		`-pyplot=sys.modules.get("matplotlib.pyplot")`
`269`	`284`	`ifpyplot:`
`270`		`-pyplot.switch_backend(candidates)# Actually resolves the backend.`
`271`	`285`	`frommatplotlibimportrcParams`
	`286`	`+pyplot.switch_backend(candidates)# Actually resolves the backend.`
`272`	`287`	`returnrcParams["backend"]`
`273`	`288`	`else:`
`274`	`289`	`returncandidates`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,8 @@`
`13`	`13`	`exceptImportError:`
`14`	`14`	`importmock`
`15`	`15`
`16`		`-withmatplotlib.rc_context(rc={'backend':'Qt4Agg'}):`
`17`		`-qt_compat=pytest.importorskip('matplotlib.backends.qt_compat')`
`18`		`-frommatplotlib.backends.backend_qt4import (`
`19`		`-MODIFIER_KEYS,SUPER,ALT,CTRL,SHIFT)# noqa`
	`16`	`+pytest.importorskip('PyQt4')`
	`17`	`+qt_compat=pytest.importorskip('matplotlib.backends.qt_compat')`
`20`	`18`
`21`	`19`	`QtCore=qt_compat.QtCore`
`22`	`20`	`_,ControlModifier,ControlKey=MODIFIER_KEYS[CTRL]`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,10 @@`
`16`	`16`	`exceptImportError:`
`17`	`17`	`importmock`
`18`	`18`
`19`		`-withmatplotlib.rc_context(rc={'backend':'Qt5Agg'}):`
`20`		`-qt_compat=pytest.importorskip('matplotlib.backends.qt_compat',`
`21`		`-minversion='5')`
	`19`	`+pytest.importorskip('PyQt5')`
	`20`	`+qt_compat=pytest.importorskip('matplotlib.backends.qt_compat',`
	`21`	`+minversion='5')`
	`22`	`+`
`22`	`23`	`frommatplotlib.backends.backend_qt5import (`
`23`	`24`	`MODIFIER_KEYS,SUPER,ALT,CTRL,SHIFT)# noqa`
`24`	`25`

Comments

(0)