Merged revisions 7790 via svnmerge from

efiring · efiring · commit 14d4c6742844 · 2009-09-19T06:32:38.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7790 | efiring | 2009-09-18 20:28:43 -1000 (Fri, 18 Sep 2009) | 2 lines Fix bug in mlab.demean, with axis = -1 ........ svn path=/trunk/matplotlib/; revision=7791
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -177,11 +177,11 @@ def detrend(x, key=None):
 def demean(x, axis=0):
     "Return x minus its mean along the specified axis"
     x = np.asarray(x)
-    if axis:
-        ind = [slice(None)] * axis
-        ind.append(np.newaxis)
-        return x - x.mean(axis)[ind]
-    return x - x.mean(axis)
+    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]
 
 def detrend_mean(x):
     "Return x minus the mean(x)"
