Commit1e68b16

authored

Merge pull request#17297 from anntzer/getstate

Simplify pickling support.

2 parentsd1be9ad +b923ef3 commit1e68b16Copy full SHA for 1e68b16

File tree

-32

lines changed

-32

lines changed

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,16 +256,6 @@ def __init__(self, type, seq=None):`
`256`	`256`	`def__repr__(self):`
`257`	`257`	`return'<a list of %d %s objects>'% (len(self),self.type)`
`258`	`258`
`259`		`-__str__=__repr__`
`260`		`-`
`261`		`-def__getstate__(self):`
`262`		`-# store a dictionary of this SilentList's state`
`263`		`-return {'type':self.type,'seq':self[:]}`
`264`		`-`
`265`		`-def__setstate__(self,state):`
`266`		`-self.type=state['type']`
`267`		`-self.extend(state['seq'])`
`268`		`-`
`269`	`259`
`270`	`260`	`@deprecated("3.3")`
`271`	`261`	`classIgnoredKeywordWarning(UserWarning):`

Lines changed: 2 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -312,17 +312,7 @@ def __init__(self, nrows, ncols, figure=None,`
`312`	`312`	`_AllowedKeys= ["left","bottom","right","top","wspace","hspace"]`
`313`	`313`
`314`	`314`	`def__getstate__(self):`
`315`		`-state=self.__dict__`
`316`		`-try:`
`317`		`-state.pop('_layoutbox')`
`318`		`-exceptKeyError:`
`319`		`-pass`
`320`		`-returnstate`
`321`		`-`
`322`		`-def__setstate__(self,state):`
`323`		`-self.__dict__=state`
`324`		`-# layoutboxes don't survive pickling...`
`325`		`-self._layoutbox=None`
	`315`	`+return {**self.__dict__,"_layoutbox":None}`
`326`	`316`
`327`	`317`	`defupdate(self,**kwargs):`
`328`	`318`	`"""`
`@@ -580,17 +570,7 @@ def num2(self, value):`
`580`	`570`	`self._num2=value`
`581`	`571`
`582`	`572`	`def__getstate__(self):`
`583`		`-state=self.__dict__`
`584`		`-try:`
`585`		`-state.pop('_layoutbox')`
`586`		`-exceptKeyError:`
`587`		`-pass`
`588`		`-returnstate`
`589`		`-`
`590`		`-def__setstate__(self,state):`
`591`		`-self.__dict__=state`
`592`		`-# layoutboxes don't survive pickling...`
`593`		`-self._layoutbox=None`
	`573`	`+return {**self.__dict__,"_layoutbox":None}`
`594`	`574`
`595`	`575`	`defget_gridspec(self):`
`596`	`576`	`returnself._gridspec`

Comments

(0)