Merge pull request #480 from efiring/numpy_copyto

jkseppan · jkseppan · commit 05781473b636 · 2011-09-20T09:31:36.000-07:00
cbook._putmask added to handle putmask deprecation in numpy &gt; 1.6.x
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -1827,6 +1827,23 @@ def is_math_text(s):
 
     return even_dollars
 
+# Numpy > 1.6.x deprecates putmask in favor of the new copyto.
+# So long as we support versions 1.6.x and less, we need the
+# following local version of putmask.  We choose to make a
+# local version of putmask rather than of copyto because the
+# latter includes more functionality than the former. Therefore
+# it is easy to make a local version that gives full putmask
+# behavior, but duplicating the full copyto behavior would be
+# more difficult.
+
+try:
+    np.copyto
+except AttributeError:
+    _putmask = np.putmask
+else:
+    def _putmask(a, mask, values):
+        return np.copyto(a, values, where=mask)
+
 
 if __name__=='__main__':
     assert( allequal([1,1,1]) )
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -516,7 +516,7 @@ def __call__(self, X, alpha=None, bytes=False):
             # masked values are substituted below; no need to fill them here
 
         if xa.dtype.char in np.typecodes['Float']:
-            np.putmask(xa, xa==1.0, 0.9999999) #Treat 1.0 as slightly less than 1.
+            cbook._putmask(xa, xa==1.0, 0.9999999) #Treat 1.0 as slightly less than 1.
             # The following clip is fast, and prevents possible
             # conversion of large positive values to negative integers.
 
@@ -528,15 +528,15 @@ def __call__(self, X, alpha=None, bytes=False):
 
             # ensure that all 'under' values will still have negative
             # value after casting to int
-            np.putmask(xa, xa<0.0, -1)
+            cbook._putmask(xa, xa<0.0, -1)
             xa = xa.astype(int)
         # Set the over-range indices before the under-range;
         # otherwise the under-range values get converted to over-range.
-        np.putmask(xa, xa>self.N-1, self._i_over)
-        np.putmask(xa, xa<0, self._i_under)
+        cbook._putmask(xa, xa>self.N-1, self._i_over)
+        cbook._putmask(xa, xa<0, self._i_under)
         if mask_bad is not None:
             if mask_bad.shape == xa.shape:
-                np.putmask(xa, mask_bad, self._i_bad)
+                cbook._putmask(xa, mask_bad, self._i_bad)
             elif mask_bad:
                 xa.fill(self._i_bad)
         if bytes:
@@ -927,7 +927,7 @@ def __call__(self, value, clip=None):
                 mask = (resdat <= 0)
             else:
                 mask |= resdat <= 0
-            np.putmask(resdat, mask, 1)
+            cbook._putmask(resdat, mask, 1)
             np.log(resdat, resdat)
             resdat -= np.log(vmin)
             resdat /= (np.log(vmax) - np.log(vmin))
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -24,6 +24,7 @@
 from matplotlib.artist import allow_rasterization
 from matplotlib import docstring
 import matplotlib.font_manager as font_manager
+import matplotlib.cbook as cbook
 from matplotlib.cbook import delete_masked_points
 from matplotlib.patches import CirclePolygon
 import math
@@ -624,8 +625,8 @@ def _h_arrows(self, length):
         Y0 = shrink * Y0[np.newaxis,:]
         short = np.repeat(length < minsh, 8, axis=1)
         # Now select X0, Y0 if short, otherwise X, Y
-        np.putmask(X, short, X0)
-        np.putmask(Y, short, Y0)
+        cbook._putmask(X, short, X0)
+        cbook._putmask(Y, short, Y0)
         if self.pivot[:3] == 'mid':
             X -= 0.5 * X[:,3, np.newaxis]
         elif self.pivot[:3] == 'tip':
@@ -641,8 +642,8 @@ def _h_arrows(self, length):
             X1 = np.repeat(x1[np.newaxis, :], N, axis=0)
             Y1 = np.repeat(y1[np.newaxis, :], N, axis=0)
             tooshort = np.repeat(tooshort, 8, 1)
-            np.putmask(X, tooshort, X1)
-            np.putmask(Y, tooshort, Y1)
+            cbook._putmask(X, tooshort, X1)
+            cbook._putmask(Y, tooshort, Y1)
         # Mask handling is deferred to the caller, _make_verts.
         return X, Y
 
