Commit090e9f1

authored

Merge pull request#10282 from anntzer/deprecate-backend-qt45

API: Deprecate the backend.qt{4,5} rcParams.

2 parentsda3e628 +188a4af commit090e9f1Copy full SHA for 090e9f1

File tree

+23

-7

lines changed

+23

-7

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1116,8 +1116,10 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):`
`1116`	`1116`	`returnconfig_from_file`
`1117`	`1117`
`1118`	`1118`	`iter_params=six.iteritems(defaultParams)`
`1119`		`-config=RcParams([(key,default)forkey, (default,_)initer_params`
`1120`		`-ifkeynotin_all_deprecated])`
	`1119`	`+withwarnings.catch_warnings():`
	`1120`	`+warnings.simplefilter("ignore",mplDeprecation)`
	`1121`	`+config=RcParams([(key,default)forkey, (default,_)initer_params`
	`1122`	`+ifkeynotin_all_deprecated])`
`1121`	`1123`	`config.update(config_from_file)`
`1122`	`1124`
`1123`	`1125`	`ifconfig['datapath']isNone:`
`@@ -1155,9 +1157,11 @@ def rc_params_from_file(fname, fail_on_error=False, use_default_template=True):`
`1155`	`1157`
`1156`	`1158`	`rcParamsOrig=rcParams.copy()`
`1157`	`1159`
`1158`		`-rcParamsDefault=RcParams([(key,default)forkey, (default,converter)in`
`1159`		`-six.iteritems(defaultParams)`
`1160`		`-ifkeynotin_all_deprecated])`
	`1160`	`+withwarnings.catch_warnings():`
	`1161`	`+warnings.simplefilter("ignore",mplDeprecation)`
	`1162`	`+rcParamsDefault=RcParams([(key,default)forkey, (default,converter)in`
	`1163`	`+six.iteritems(defaultParams)`
	`1164`	`+ifkeynotin_all_deprecated])`
`1161`	`1165`
`1162`	`1166`	`rcParams['ps.usedistiller']=checkdep_ps_distiller(`
`1163`	`1167`	`rcParams['ps.usedistiller'])`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,8 +266,20 @@ def validate_backend(s):`
`266`	`266`	`return_validate_standard_backends(s)`
`267`	`267`
`268`	`268`
`269`		`-validate_qt4=ValidateInStrings('backend.qt4', ['PyQt4','PySide','PyQt4v2'])`
`270`		`-validate_qt5=ValidateInStrings('backend.qt5', ['PyQt5','PySide2'])`
	`269`	`+@deprecated("2.2",`
	`270`	`+"The backend.qt4 rcParam was deprecated in version 2.2. In order "`
	`271`	`+"to force the use of a specific Qt4 binding, either import that "`
	`272`	`+"binding first, or set the QT_API environment variable.")`
	`273`	`+defvalidate_qt4(s):`
	`274`	`+returnValidateInStrings("backend.qt4", ['PyQt4','PySide','PyQt4v2'])(s)`
	`275`	`+`
	`276`	`+`
	`277`	`+@deprecated("2.2",`
	`278`	`+"The backend.qt5 rcParam was deprecated in version 2.2. In order "`
	`279`	`+"to force the use of a specific Qt5 binding, either import that "`
	`280`	`+"binding first, or set the QT_API environment variable.")`
	`281`	`+defvalidate_qt5(s):`
	`282`	`+returnValidateInStrings("backend.qt5", ['PyQt5','PySide2'])(s)`
`271`	`283`
`272`	`284`
`273`	`285`	`defvalidate_toolbar(s):`

Comments

(0)