Replace _putmask calls with copyto calls

dstansby · dstansby · commit 3a4213110754 · 2016-11-21T13:05:27.000Z
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -473,7 +473,7 @@ def __call__(self, X, alpha=None, bytes=False):
             # Treat 1.0 as slightly less than 1.
             vals = np.array([1, 0], dtype=xa.dtype)
             almost_one = np.nextafter(*vals)
-            cbook._putmask(xa, xa == 1.0, almost_one)
+            np.copyto(xa, almost_one, where=xa == 1.0)
             # The following clip is fast, and prevents possible
             # conversion of large positive values to negative integers.
 
@@ -482,15 +482,15 @@ def __call__(self, X, alpha=None, bytes=False):
 
             # ensure that all 'under' values will still have negative
             # value after casting to int
-            cbook._putmask(xa, xa < 0.0, -1)
+            np.copyto(xa, -1, where=xa < 0.0)
             xa = xa.astype(int)
         # Set the over-range indices before the under-range;
         # otherwise the under-range values get converted to over-range.
-        cbook._putmask(xa, xa > self.N - 1, self._i_over)
-        cbook._putmask(xa, xa < 0, self._i_under)
+        np.copyto(xa, self._i_over, where=xa > self.N - 1)
+        np.copyto(xa, self._i_under, where=xa < 0)
         if mask_bad is not None:
             if mask_bad.shape == xa.shape:
-                cbook._putmask(xa, mask_bad, self._i_bad)
+                np.copyto(xa, self._i_bad, where=mask_bad)
             elif mask_bad:
                 xa.fill(self._i_bad)
         if bytes:
@@ -990,7 +990,7 @@ def __call__(self, value, clip=None):
                 mask = (resdat <= 0)
             else:
                 mask |= resdat <= 0
-            cbook._putmask(resdat, mask, 1)
+            np.copyto(resdat, 1, where=mask)
             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
@@ -707,8 +707,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
-        cbook._putmask(X, short, X0)
-        cbook._putmask(Y, short, Y0)
+        np.copyto(X, X0, where=short)
+        np.copyto(Y, Y0, where=short)
         if self.pivot == 'middle':
             X -= 0.5 * X[:, 3, np.newaxis]
         elif self.pivot == 'tip':
@@ -728,8 +728,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)
-            cbook._putmask(X, tooshort, X1)
-            cbook._putmask(Y, tooshort, Y1)
+            np.copyto(X, X1, where=tooshort)
+            np.copyto(Y, Y1, where=tooshort)
         # Mask handling is deferred to the caller, _make_verts.
         return X, Y
 
