Scipy problem workarounds

efiring · efiring · commit a4fa82f9ccf2 · 2005-12-05T19:04:58.000Z
svn path=/trunk/matplotlib/; revision=1906
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -75,13 +75,14 @@ def clabel(self, *args, **kwargs):
             levels = self.levels
             indices = range(len(self.levels))
         elif len(args) == 1:
+            levlabs = list(args[0])
             indices, levels = [], []
             for i, lev in enumerate(self.levels):
-                if lev in args[0]:
+                if lev in levlabs:
                     indices.append(i)
                     levels.append(lev)
-            if len(levels) < len(args[0]):
-                msg = "Specified levels " + str(levels)
+            if len(levels) < len(levlabs):
+                msg = "Specified levels " + str(levlabs)
                 msg += "\n don't match available levels "
                 msg += str(self.levels)
                 raise ValueError(msg)
@@ -426,7 +427,8 @@ def __init__(self, ax, *args, **kwargs):
                 self.linewidths = 0.05 # Good default for Postscript.
             if iterable(self.linewidths):
                 self.linewidths = self.linewidths[0]
-            C = _contour.Cntr(x, y, z.filled(), z.mask())
+            #C = _contour.Cntr(x, y, z.filled(), z.mask())
+            C = _contour.Cntr(x, y, z.filled(), ma.getmask(z))
             lowers = self.levels[:-1]
             uppers = self.levels[1:]
             for level, level_upper, color in zip(lowers, uppers, self.tcolors):
@@ -441,7 +443,8 @@ def __init__(self, ax, *args, **kwargs):
 
         else:
             tlinewidths = self._process_linewidths()
-            C = _contour.Cntr(x, y, z.filled(), z.mask())
+            #C = _contour.Cntr(x, y, z.filled(), z.mask())
+            C = _contour.Cntr(x, y, z.filled(), ma.getmask(z))
             for level, color, width in zip(self.levels, self.tcolors, tlinewidths):
                 nlist = C.trace(level, points = 1)
                 col = LineCollection(nlist)
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -50,14 +50,16 @@ def unmasked_index_ranges(mask, compressed = True):
     Example:
 
     y = ma.array(arange(5), mask = [0,0,1,0,0])
-    ii = unmasked_index_ranges(y.mask())
+    #ii = unmasked_index_ranges(y.mask())
+    ii = unmasked_index_ranges(ma.getmask(y))
         # returns [[0,2,] [2,4,]]
 
     y.compressed().filled()[ii[1,0]:ii[1,1]]
         # returns array [3,4,]
         # (The 'filled()' method converts the masked array to a numerix array.)
 
-    i0, i1 = unmasked_index_ranges(y.mask(), compressed=False)
+    #i0, i1 = unmasked_index_ranges(y.mask(), compressed=False)
+    i0, i1 = unmasked_index_ranges(ma.getmask(y), compressed=False)
         # returns [[0,3,] [2,5,]]
 
     y.filled()[ii[1,0]:ii[1,1]]
