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

Commitf2fabc0

authored

Merge pull request#6821 from anntzer/break-line-refcycle

MNT: Break reference cycle Line2D <-> Line2D._lineFunc.

2 parentse6fccba +64479b4 commitf2fabc0Copy full SHA for f2fabc0

File tree

2 files changed

-25

lines changed

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

2 files changed

-25

lines changed

`‎lib/matplotlib/lines.py`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,12 +445,6 @@ def __init__(self, xdata, ydata,`
`445`	`445`
`446`	`446`	`self.set_data(xdata,ydata)`
`447`	`447`
`448`		`-def__getstate__(self):`
`449`		`-state=super(Line2D,self).__getstate__()`
`450`		`-# _linefunc will be restored on draw time.`
`451`		`-state.pop('_lineFunc',None)`
`452`		`-returnstate`
`453`		`-`
`454`	`448`	`defcontains(self,mouseevent):`
`455`	`449`	`"""`
`456`	`450`	`Test whether the mouse event occurred on the line. The pick`
`@@ -784,7 +778,7 @@ def draw(self, renderer):`
`784`	`778`	`iffuncname!='_draw_nothing':`
`785`	`779`	`tpath,affine=transf_path.get_transformed_path_and_affine()`
`786`	`780`	`iflen(tpath.vertices):`
`787`		`-self._lineFunc=getattr(self,funcname)`
	`781`	`+line_func=getattr(self,funcname)`
`788`	`782`	`gc=renderer.new_gc()`
`789`	`783`	`self._set_gc_clip(gc)`
`790`	`784`
`@@ -807,7 +801,7 @@ def draw(self, renderer):`
`807`	`801`	`ifself.get_sketch_params()isnotNone:`
`808`	`802`	`gc.set_sketch_params(*self.get_sketch_params())`
`809`	`803`
`810`		`-self._draw_lines(renderer,gc,tpath,affine.frozen())`
	`804`	`+line_func(renderer,gc,tpath,affine.frozen())`
`811`	`805`	`gc.restore()`
`812`	`806`
`813`	`807`	`ifself._markerandself._markersize>0:`
`@@ -1250,9 +1244,6 @@ def set_dashes(self, seq):`
`1250`	`1244`	`else:`
`1251`	`1245`	`self.set_linestyle((0,seq))`
`1252`	`1246`
`1253`		`-def_draw_lines(self,renderer,gc,path,trans):`
`1254`		`-self._lineFunc(renderer,gc,path,trans)`
`1255`		`-`
`1256`	`1247`	`def_draw_solid(self,renderer,gc,path,trans):`
`1257`	`1248`	`gc.set_linestyle('solid')`
`1258`	`1249`	`gc.set_dashes(self._dashOffset,self._dashSeq)`

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

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -228,20 +228,6 @@ def test_image():`
`228`	`228`	`pickle.dump(fig,BytesIO())`
`229`	`229`
`230`	`230`
`231`		`-@cleanup`
`232`		`-deftest_grid():`
`233`		`-frommatplotlib.backends.backend_aggimportnew_figure_manager`
`234`		`-manager=new_figure_manager(1000)`
`235`		`-fig=manager.canvas.figure`
`236`		`-ax=fig.add_subplot(1,1,1)`
`237`		`-ax.grid()`
`238`		`-# Drawing the grid triggers instance methods to be attached`
`239`		`-# to the Line2D object (_lineFunc).`
`240`		`-manager.canvas.draw()`
`241`		`-`
`242`		`-pickle.dump(ax,BytesIO())`
`243`		`-`
`244`		`-`
`245`	`231`	`@cleanup`
`246`	`232`	`deftest_polar():`
`247`	`233`	`ax=plt.subplot(111,polar=True)`

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!

Commitf2fabc0

File tree

2 files changed

2 files changed

`‎lib/matplotlib/lines.py`

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

0 commit comments