Merge pull request matplotlib#11862 from QuLogic/slice-tuple

jklymak · web-flow · commit 9af32e6e7db2 · 2018-08-17T10:41:15.000-07:00
Fix NumPy FutureWarning for non-tuple indexing.
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -280,17 +280,7 @@ def detrend_mean(x, axis=None):
     if axis is not None and axis+1 > x.ndim:
         raise ValueError('axis(=%s) out of bounds' % axis)
 
-    # short-circuit 0-D array.
-    if not x.ndim:
-        return np.array(0., dtype=x.dtype)
-
-    # short-circuit simple operations
-    if axis == 0 or axis is None or x.ndim <= 1:
-        return x - x.mean(axis)
-
-    ind = [slice(None)] * x.ndim
-    ind[axis] = np.newaxis
-    return x - x.mean(axis)[ind]
+    return x - x.mean(axis, keepdims=True)
 
 
 def detrend_none(x, axis=None):
