NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commit2aa4b7d

authored

Merge pull request#22815 from anntzer/normpickle

Fix pickling of globally available, dynamically generated norm classes.

2 parents1999228 +80d0959 commit2aa4b7dCopy full SHA for 2aa4b7d

File tree

2 files changed

+25

-3

lines changed

lib/matplotlib
- colors.py
- tests
  - test_pickle.py

2 files changed

+25

-3

lines changed

`‎lib/matplotlib/colors.py`

Lines changed: 20 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`fromcollections.abcimportSized,Sequence`
`44`	`44`	`importcopy`
`45`	`45`	`importfunctools`
	`46`	`+importimportlib`
`46`	`47`	`importinspect`
`47`	`48`	`importio`
`48`	`49`	`importitertools`
`@@ -1528,9 +1529,22 @@ def _make_norm_from_scale(scale_cls, base_norm_cls, bound_init_signature):`
`1528`	`1529`
`1529`	`1530`	`classNorm(base_norm_cls):`
`1530`	`1531`	`def__reduce__(self):`
	`1532`	`+cls=type(self)`
	`1533`	`+# If the class is toplevel-accessible, it is possible to directly`
	`1534`	`+# pickle it "by name". This is required to support norm classes`
	`1535`	`+# defined at a module's toplevel, as the inner base_norm_cls is`
	`1536`	`+# otherwise unpicklable (as it gets shadowed by the generated norm`
	`1537`	`+# class). If either import or attribute access fails, fall back to`
	`1538`	`+# the general path.`
	`1539`	`+try:`
	`1540`	`+ifclsisgetattr(importlib.import_module(cls.__module__),`
	`1541`	`+cls.__qualname__):`
	`1542`	`+return (_create_empty_object_of_class, (cls,),vars(self))`
	`1543`	`+except (ImportError,AttributeError):`
	`1544`	`+pass`
`1531`	`1545`	`return (_picklable_norm_constructor,`
`1532`	`1546`	`(scale_cls,base_norm_cls,bound_init_signature),`
`1533`		`-self.__dict__)`
	`1547`	`+vars(self))`
`1534`	`1548`
`1535`	`1549`	`def__init__(self,args,*kwargs):`
`1536`	`1550`	`ba=bound_init_signature.bind(args,*kwargs)`
`@@ -1603,11 +1617,14 @@ def autoscale_None(self, A):`
`1603`	`1617`	`returnNorm`
`1604`	`1618`
`1605`	`1619`
`1606`		`-def_picklable_norm_constructor(*args):`
`1607`		`-cls=_make_norm_from_scale(*args)`
	`1620`	`+def_create_empty_object_of_class(cls):`
`1608`	`1621`	`returncls.__new__(cls)`
`1609`	`1622`
`1610`	`1623`
	`1624`	`+def_picklable_norm_constructor(*args):`
	`1625`	`+return_create_empty_object_of_class(_make_norm_from_scale(*args))`
	`1626`	`+`
	`1627`	`+`
`1611`	`1628`	`@make_norm_from_scale(`
`1612`	`1629`	`scale.FuncScale,`
`1613`	`1630`	`init=lambdafunctions,vmin=None,vmax=None,clip=False:None)`

`‎lib/matplotlib/tests/test_pickle.py`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,11 @@ def test_mpl_toolkits():`
`221`	`221`	`asserttype(pickle.loads(pickle.dumps(ax)))==parasite_axes.HostAxes`
`222`	`222`
`223`	`223`
	`224`	`+deftest_standard_norm():`
	`225`	`+asserttype(pickle.loads(pickle.dumps(mpl.colors.LogNorm()))) \`
	`226`	`+==mpl.colors.LogNorm`
	`227`	`+`
	`228`	`+`
`224`	`229`	`deftest_dynamic_norm():`
`225`	`230`	`logit_norm_instance=mpl.colors.make_norm_from_scale(`
`226`	`231`	`mpl.scale.LogitScale,mpl.colors.Normalize)()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit2aa4b7d

File tree

2 files changed

2 files changed

`‎lib/matplotlib/colors.py`

`‎lib/matplotlib/tests/test_pickle.py`

0 commit comments