Merged revisions 8610 via svnmerge from

https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8610 | weathergod | 2010-08-01 16:01:25 -0500 (Sun, 01 Aug 2010) | 3 lines
  
  Fixed inconsistency with argument handling between 2d and 3d versions of contour.
  Documentation is fixed as well for 3d versions of contour and contourf.
........

svn path=/trunk/matplotlib/; revision=8611

Author: WeatherGod

Diff for: lib/mpl_toolkits/mplot3d/axes3d.py

@@ -896,7 +896,7 @@ def _3d_extend_contour(self, cset, stride=5):
         for col in colls:
             self.collections.remove(col)
 
-    def contour(self, X, Y, Z, levels=10, **kwargs):
+    def contour(self, X, Y, Z, *args, **kwargs):
         '''
         Create a 3D contour plot.
 
@@ -912,7 +912,7 @@ def contour(self, X, Y, Z, levels=10, **kwargs):
                     lines on this position in plane normal to zdir
         ==========  ================================================
 
-        Other keyword arguments are passed on to
+        The positional and other keyword arguments are passed on to
         :func:`~matplotlib.axes.Axes.contour`
 
         Returns a :class:`~matplotlib.axes.Axes.contour`
@@ -926,7 +926,7 @@ def contour(self, X, Y, Z, levels=10, **kwargs):
         had_data = self.has_data()
 
         jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
-        cset = Axes.contour(self, jX, jY, jZ, **kwargs)
+        cset = Axes.contour(self, jX, jY, jZ, *args, **kwargs)
 
         zdir = '-' + zdir
         if extend3d:
@@ -948,7 +948,7 @@ def contourf(self, X, Y, Z, *args, **kwargs):
 
         *X*, *Y*, *Z*: data points.
 
-        Keyword arguments are passed on to
+        The positional and keyword arguments are passed on to
         :func:`~matplotlib.axes.Axes.contourf`
 
         Returns a :class:`~matplotlib.axes.Axes.contourf`