SF.net SVN: matplotlib:[5838] trunk/matplotlib/lib/matplotlib

[<dmk...@us...>]

Revision: 5838
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5838&view=rev
Author:   dmkaplan
Date:     2008-07-24 14:22:20 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
Minor changes in response to comments by John Hunter on empty lists in python
args and avoiding unspecified argument lists.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/backend_bases.py
    trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py
    trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
    trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
    trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
    trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
    trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
    trunk/matplotlib/lib/matplotlib/blocking_input.py
    trunk/matplotlib/lib/matplotlib/contour.py

Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -1391,7 +1391,7 @@
         """
         raise NotImplementedError
 
-    def start_event_loop(self,*args,**kwargs):
+    def start_event_loop(self,timeout):
         """
         Start an event loop.  This is used to start a blocking event
         loop so that interactive functions, such as ginput and
@@ -1403,7 +1403,7 @@
         """
         raise NotImplementedError
 
-    def stop_event_loop(self,*args,**kwargs):
+    def stop_event_loop(self):
         """
         Stop an event loop.  This is used to stop a blocking event
         loop so that interactive functions, such as ginput and

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_cocoaagg.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -58,12 +58,12 @@
     def blit(self, bbox):
         pass
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -247,12 +247,12 @@
     def widget(self):
         return self.canvas
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 def destroy_figure(ptr,figman):

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -396,12 +396,12 @@
         gtk.gdk.flush()
         gtk.gdk.threads_leave()
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 class FigureManagerGTK(FigureManagerBase):

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -177,12 +177,12 @@
     def flush_events(self):
         qt.qApp.processEvents()
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 class FigureManagerQT( FigureManagerBase ):

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -181,12 +181,12 @@
     def flush_events(self):
         Qt.qApp.processEvents()
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 class FigureManagerQT( FigureManagerBase ):

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -287,12 +287,12 @@
     def flush_events(self):
         self._master.update()
 
-    def start_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.start_event_loop_default(self,*args,**kwargs)
+    def start_event_loop(self,timeout):
+        FigureCanvasBase.start_event_loop_default(self,timeout)
     start_event_loop.__doc__=FigureCanvasBase.start_event_loop_default.__doc__
 
-    def stop_event_loop(self,*args,**kwargs):
-        FigureCanvasBase.stop_event_loop_default(self,*args,**kwargs)
+    def stop_event_loop(self):
+        FigureCanvasBase.stop_event_loop_default(self)
     stop_event_loop.__doc__=FigureCanvasBase.stop_event_loop_default.__doc__
 
 class FigureManagerTkAgg(FigureManagerBase):

Modified: trunk/matplotlib/lib/matplotlib/blocking_input.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/blocking_input.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/blocking_input.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -283,13 +283,11 @@
             """
             # Figure out label rotation.
             if self.inline: lcarg = lc
-            else: lcarg = []
+            else: lcarg = None
             rotation,nlc = cs.calc_label_rot_and_inline(
                 slc, imin, lw, lcarg,
                 self.inline_spacing )
 
-
-
             cs.add_label(xmin,ymin,rotation,cs.labelLevelList[lmin],
                          cs.labelCValueList[lmin])
 

Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2008-07-24 13:39:34 UTC (rev 5837)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2008-07-24 14:22:20 UTC (rev 5838)
@@ -485,7 +485,7 @@
                     x,y,ind  = self.locate_label(slc, lw)
 
                     if inline: lcarg = lc
-                    else: lcarg = []
+                    else: lcarg = None
                     rotation,new=self.calc_label_rot_and_inline(
                         slc0, ind, lw, lcarg,
                         inline_spacing )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.