Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b1a54c0

Browse files
committed
Minor changes in response to comments by John Hunter on empty lists in python
args and avoiding unspecified argument lists. svn path=/trunk/matplotlib/; revision=5838
1 parent b930b1e commit b1a54c0

9 files changed

Lines changed: 28 additions & 30 deletions

File tree

lib/matplotlib/backend_bases.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@ def flush_events(self):
13911391
"""
13921392
raise NotImplementedError
13931393

1394-
def start_event_loop(self,*args,**kwargs):
1394+
def start_event_loop(self,timeout):
13951395
"""
13961396
Start an event loop. This is used to start a blocking event
13971397
loop so that interactive functions, such as ginput and
@@ -1403,7 +1403,7 @@ def start_event_loop(self,*args,**kwargs):
14031403
"""
14041404
raise NotImplementedError
14051405

1406-
def stop_event_loop(self,*args,**kwargs):
1406+
def stop_event_loop(self):
14071407
"""
14081408
Stop an event loop. This is used to stop a blocking event
14091409
loop so that interactive functions, such as ginput and

lib/matplotlib/backends/backend_cocoaagg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ def draw(self):
5858
def blit(self, bbox):
5959
pass
6060

61-
def start_event_loop(self,*args,**kwargs):
62-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
61+
def start_event_loop(self,timeout):
62+
FigureCanvasBase.start_event_loop_default(self,timeout)
6363
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
6464

65-
def stop_event_loop(self,*args,**kwargs):
66-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
65+
def stop_event_loop(self):
66+
FigureCanvasBase.stop_event_loop_default(self)
6767
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
6868

6969

lib/matplotlib/backends/backend_fltkagg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,12 @@ def blit(self,bbox):
247247
def widget(self):
248248
return self.canvas
249249

250-
def start_event_loop(self,*args,**kwargs):
251-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
250+
def start_event_loop(self,timeout):
251+
FigureCanvasBase.start_event_loop_default(self,timeout)
252252
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
253253

254-
def stop_event_loop(self,*args,**kwargs):
255-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
254+
def stop_event_loop(self):
255+
FigureCanvasBase.stop_event_loop_default(self)
256256
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
257257

258258
def destroy_figure(ptr,figman):

lib/matplotlib/backends/backend_gtk.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,12 +396,12 @@ def flush_events(self):
396396
gtk.gdk.flush()
397397
gtk.gdk.threads_leave()
398398

399-
def start_event_loop(self,*args,**kwargs):
400-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
399+
def start_event_loop(self,timeout):
400+
FigureCanvasBase.start_event_loop_default(self,timeout)
401401
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
402402

403-
def stop_event_loop(self,*args,**kwargs):
404-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
403+
def stop_event_loop(self):
404+
FigureCanvasBase.stop_event_loop_default(self)
405405
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
406406

407407
class FigureManagerGTK(FigureManagerBase):

lib/matplotlib/backends/backend_qt.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ def _get_key( self, event ):
177177
def flush_events(self):
178178
qt.qApp.processEvents()
179179

180-
def start_event_loop(self,*args,**kwargs):
181-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
180+
def start_event_loop(self,timeout):
181+
FigureCanvasBase.start_event_loop_default(self,timeout)
182182
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
183183

184-
def stop_event_loop(self,*args,**kwargs):
185-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
184+
def stop_event_loop(self):
185+
FigureCanvasBase.stop_event_loop_default(self)
186186
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
187187

188188
class FigureManagerQT( FigureManagerBase ):

lib/matplotlib/backends/backend_qt4.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ def _get_key( self, event ):
181181
def flush_events(self):
182182
Qt.qApp.processEvents()
183183

184-
def start_event_loop(self,*args,**kwargs):
185-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
184+
def start_event_loop(self,timeout):
185+
FigureCanvasBase.start_event_loop_default(self,timeout)
186186
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
187187

188-
def stop_event_loop(self,*args,**kwargs):
189-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
188+
def stop_event_loop(self):
189+
FigureCanvasBase.stop_event_loop_default(self)
190190
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
191191

192192
class FigureManagerQT( FigureManagerBase ):

lib/matplotlib/backends/backend_tkagg.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ def key_release(self, event):
287287
def flush_events(self):
288288
self._master.update()
289289

290-
def start_event_loop(self,*args,**kwargs):
291-
FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
290+
def start_event_loop(self,timeout):
291+
FigureCanvasBase.start_event_loop_default(self,timeout)
292292
start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
293293

294-
def stop_event_loop(self,*args,**kwargs):
295-
FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
294+
def stop_event_loop(self):
295+
FigureCanvasBase.stop_event_loop_default(self)
296296
stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
297297

298298
class FigureManagerTkAgg(FigureManagerBase):

lib/matplotlib/blocking_input.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,11 @@ def button1(self,event):
283283
"""
284284
# Figure out label rotation.
285285
if self.inline: lcarg = lc
286-
else: lcarg = []
286+
else: lcarg = None
287287
rotation,nlc = cs.calc_label_rot_and_inline(
288288
slc, imin, lw, lcarg,
289289
self.inline_spacing )
290290

291-
292-
293291
cs.add_label(xmin,ymin,rotation,cs.labelLevelList[lmin],
294292
cs.labelCValueList[lmin])
295293

lib/matplotlib/contour.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def labels(self, inline, inline_spacing):
485485
x,y,ind = self.locate_label(slc, lw)
486486

487487
if inline: lcarg = lc
488-
else: lcarg = []
488+
else: lcarg = None
489489
rotation,new=self.calc_label_rot_and_inline(
490490
slc0, ind, lw, lcarg,
491491
inline_spacing )

0 commit comments

Comments
 (0)