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

tacaswell · web-flow · commit c5e2ffd2ed99 · 2018-08-19T14:59:56.000-04:00
Backport PR #11862 on branch v3.0.x
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -382,17 +382,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):
