Commit9d3b14c

authored

Merge pull request#9070 from anntzer/no-renderer-uid

Replace use of renderer._uid by weakref.

2 parentsd0eeddb +8d22408 commit9d3b14cCopy full SHA for 9d3b14c

File tree

-18

lines changed

-18

lines changed

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`fromfunctoolsimportpartial`
`43`	`43`	`importimportlib`
`44`	`44`	`importio`
`45`		`-importitertools`
`46`	`45`	`importos`
`47`	`46`	`importsys`
`48`	`47`	`importtime`
`@@ -101,12 +100,6 @@`
`101`	`100`	`}`
`102`	`101`
`103`	`102`
`104`		`-# Used to ensure that caching based on renderer id() is unique without being as`
`105`		`-# expensive as a real UUID. 0 is used for renderers that don't derive from`
`106`		`-# here, so start at 1.`
`107`		`-_unique_renderer_id=itertools.count(1)`
`108`		`-`
`109`		`-`
`110`	`103`	`defregister_backend(format,backend,description=None):`
`111`	`104`	`"""`
`112`	`105`	`Register a backend for saving to a given file format.`
`@@ -277,12 +270,7 @@ class RendererBase(object):`
`277`	`270`
`278`	`271`	`"""`
`279`	`272`	`def__init__(self):`
`280`		`-# A lightweight id for unique-ification purposes. Along with id(self),`
`281`		`-# the combination should be unique enough to use as part of a cache key.`
`282`		`-self._uid=next(_unique_renderer_id)`
`283`		`-`
`284`	`273`	`self._texmanager=None`
`285`		`-`
`286`	`274`	`self._text2path=textpath.TextToPath()`
`287`	`275`
`288`	`276`	`defopen_group(self,s,gid=None):`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`	`importsix`
`7`	`7`
`8`		`-importmatplotlib.backend_bases`
`9`	`8`	`frommatplotlib.backends.backend_aggimportRendererAgg`
`10`	`9`	`frommatplotlib.tight_bboximportprocess_figure_for_rasterizing`
`11`	`10`
`@@ -50,9 +49,6 @@ def __init__(self, figure, width, height, dpi, vector_renderer,`
`50`	`49`	`ifraster_renderer_classisNone:`
`51`	`50`	`raster_renderer_class=RendererAgg`
`52`	`51`
`53`		`-# See matplotlib.backend_bases.RendererBase._uid.`
`54`		`-self._uid=next(matplotlib.backend_bases._unique_renderer_id)`
`55`		`-`
`56`	`52`	`self._raster_renderer_class=raster_renderer_class`
`57`	`53`	`self._width=width`
`58`	`54`	`self._height=height`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`	`importmath`
`11`	`11`	`importwarnings`
	`12`	`+importweakref`
`12`	`13`
`13`	`14`	`importcontextlib`
`14`	`15`
`@@ -179,7 +180,6 @@ class Text(Artist):`
`179`	`180`	`Handle storing and drawing of text in window or data coordinates.`
`180`	`181`	`"""`
`181`	`182`	`zorder=3`
`182`		`-`
`183`	`183`	`_cached=maxdict(50)`
`184`	`184`
`185`	`185`	`def__repr__(self):`
`@@ -913,7 +913,7 @@ def get_prop_tup(self, renderer=None):`
`913`	`913`	`self._verticalalignment,self._horizontalalignment,`
`914`	`914`	`hash(self._fontproperties),`
`915`	`915`	`self._rotation,self._rotation_mode,`
`916`		`-self.figure.dpi,id(renderer),getattr(renderer,'_uid',0),`
	`916`	`+self.figure.dpi,weakref.ref(renderer),`
`917`	`917`	`self._linespacing`
`918`	`918`	`)`
`919`	`919`

Comments

(0)