Merge pull request #12509 from meeseeksmachine/auto-backport-of-pr-12478-on-v3.0.x

QuLogic · web-flow · commit 9c9a6609a3af · 2018-10-12T17:56:46.000-04:00
Backport PR #12478 on branch v3.0.x (MAINT: numpy deprecates asscalar in 1.16)
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -91,7 +91,7 @@ def _sanitize_extrema(ex):
     if ex is None:
         return ex
     try:
-        ret = np.asscalar(ex)
+        ret = ex.item()
     except AttributeError:
         ret = float(ex)
     return ret
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -411,9 +411,9 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
 
                 A_scaled -= a_min
                 # a_min and a_max might be ndarray subclasses so use
-                # asscalar to avoid errors
-                a_min = np.asscalar(a_min.astype(scaled_dtype))
-                a_max = np.asscalar(a_max.astype(scaled_dtype))
+                # item to avoid errors
+                a_min = a_min.astype(scaled_dtype).item()
+                a_max = a_max.astype(scaled_dtype).item()
 
                 if a_min != a_max:
                     A_scaled /= ((a_max - a_min) / 0.8)
