Commit18cb697

authored

Merge pull request#23478 from tacaswell/auto-backport-of-pr-23476-on-v3.5.x

Backport PR#23476: FIX: reset to original DPI in getstate

2 parents4d02bc9 +b5f00d5 commit18cb697Copy full SHA for 18cb697

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2886,6 +2886,9 @@ def __getstate__(self):`
`2886`	`2886`	`# Set cached renderer to None -- it can't be pickled.`
`2887`	`2887`	`state["_cachedRenderer"]=None`
`2888`	`2888`
	`2889`	`+# discard any changes to the dpi due to pixel ratio changes`
	`2890`	`+state["_dpi"]=state.get('_original_dpi',state['_dpi'])`
	`2891`	`+`
`2889`	`2892`	`# add version information to the state`
`2890`	`2893`	`state['__mpl_version__']=mpl.__version__`
`2891`	`2894`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`fromdatetimeimportdatetime`
`2`	`2`	`importio`
`3`	`3`	`frompathlibimportPath`
	`4`	`+importpickle`
`4`	`5`	`importplatform`
`5`	`6`	`fromthreadingimportTimer`
`6`	`7`	`fromtypesimportSimpleNamespace`
`@@ -1360,3 +1361,11 @@ def test_kwargs_pass():`
`1360`	`1361`
`1361`	`1362`	`assertfig.get_label()=='whole Figure'`
`1362`	`1363`	`assertsub_fig.get_label()=='sub figure'`
	`1364`	`+`
	`1365`	`+`
	`1366`	`+deftest_unpickle_with_device_pixel_ratio():`
	`1367`	`+fig=Figure(dpi=42)`
	`1368`	`+fig.canvas._set_device_pixel_ratio(7)`
	`1369`	`+assertfig.dpi==42*7`
	`1370`	`+fig2=pickle.loads(pickle.dumps(fig))`
	`1371`	`+assertfig2.dpi==42`

Comments

(0)