Merge pull request #392 from ianthomas23/203_tripcolor_indexerror

efiring · efiring · commit 581e60bd87cd · 2011-07-10T11:05:42.000-07:00
Fixed issue #203.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2011-07-10 Fixed argument handling error in tripcolor/triplot/tricontour,
+           issue #203. - IMT
+
 2011-06-28 3D versions of scatter, plot, plot_wireframe, plot_surface,
            bar3d, and some other functions now support empty inputs. - BVR
 
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
@@ -141,7 +141,6 @@ def get_from_args_and_kwargs(*args, **kwargs):
             x = args[0]
             y = args[1]
             args = args[2:]  # Consumed first two args.
-            ignore_remaining_args = True
 
             # Check triangles in kwargs then args.
             triangles = kwargs.pop('triangles', None)
@@ -161,31 +160,10 @@ def get_from_args_and_kwargs(*args, **kwargs):
                 triangles = None
 
             if triangles is not None and from_args:
-                    args = args[1:]  # Consumed first item in args.
-                    ignore_remaining_args = False
+                args = args[1:]  # Consumed first item in args.
 
-            # Check for mask in kwargs then args.
+            # Check for mask in kwargs.
             mask = kwargs.pop('mask', None)
-            from_args = False
-            if mask is None and not ignore_remaining_args and len(args) > 0:
-                mask = args[0]
-                from_args = True
-
-            if mask is not None:
-                try:
-                    mask = np.asarray(mask, dtype=np.bool)
-                except ValueError:
-                    mask = None
-
-            if mask is not None and mask.ndim != 1:
-                mask = None
-
-            if mask is not None and triangles is not None and \
-                    len(mask) != triangles.shape[0]:
-                mask = None
-
-            if mask is not None and from_args:
-                args = args[1:]  # Consumed first item in args.
 
             triangulation = Triangulation(x, y, triangles, mask)
         return triangulation, args, kwargs
diff --git a/lib/matplotlib/tri/tricontour.py b/lib/matplotlib/tri/tricontour.py
@@ -109,9 +109,7 @@ def _contour_args(self, args, kwargs):
           tricontour(x, y, ...)
           tricontour(x, y, triangles, ...)
           tricontour(x, y, triangles=triangles, ...)
-          tricontour(x, y, mask, ...)
           tricontour(x, y, mask=mask, ...)
-          tricontour(x, y, triangles, mask, ...)
           tricontour(x, y, triangles, mask=mask, ...)
 
         in which case a Triangulation object will be created.  See
diff --git a/lib/matplotlib/tri/tripcolor.py b/lib/matplotlib/tri/tripcolor.py
@@ -20,9 +20,7 @@ def tripcolor(ax, *args, **kwargs):
       tripcolor(x, y, ...)
       tripcolor(x, y, triangles, ...)
       tripcolor(x, y, triangles=triangles, ...)
-      tripcolor(x, y, mask, ...)
       tripcolor(x, y, mask=mask, ...)
-      tripcolor(x, y, triangles, mask, ...)
       tripcolor(x, y, triangles, mask=mask, ...)
 
     in which case a Triangulation object will be created.  See
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -22,9 +22,7 @@ def triplot(ax, *args, **kwargs):
       triplot(x, y, ...)
       triplot(x, y, triangles, ...)
       triplot(x, y, triangles=triangles, ...)
-      triplot(x, y, mask, ...)
       triplot(x, y, mask=mask, ...)
-      triplot(x, y, triangles, mask, ...)
       triplot(x, y, triangles, mask=mask, ...)
 
     in which case a Triangulation object will be created.  See
