Remove mlab.norm_flat

dstansby · dstansby · commit 2d15f216015a · 2018-09-29T11:05:09.000+01:00
diff --git a/doc/api/next_api_changes/2018-09-18-DS.rst b/doc/api/next_api_changes/2018-09-18-DS.rst
@@ -10,6 +10,7 @@ in Matplotlib 2.2 has been removed. See below for a list:
 - `mlab.rms_flat`
 - `mlab.l1norm` (use ``numpy.linalg.norm(a, ord=1)`` instead)
 - `mlab.l2norm` (use ``numpy.linalg.norm(a, ord=2)`` instead)
+- `mlab.norm_flat` (use ``numpy.linalg.norm(a.flat, ord=2)`` instead)
 - `mlab.cohere_pairs` (use scipy.signal.coherence instead)
 - `mlab.entropy` (use scipy.stats.entropy instead)
 - `mlab.normpdf` (use scipy.stats.norm.pdf instead)
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -1247,24 +1247,6 @@ def movavg(x, n):
 """
 
 
-@cbook.deprecated("2.2", alternative='numpy.linalg.norm(a.flat, ord=p)')
-def norm_flat(a, p=2):
-    """
-    norm(a,p=2) -> l-p norm of a.flat
-
-    Return the l-p norm of *a*, considered as a flat array.  This is NOT a true
-    matrix norm, since arrays of arbitrary rank are always flattened.
-
-    *p* can be a number or the string 'Infinity' to get the L-infinity norm.
-    """
-    # This function was being masked by a more general norm later in
-    # the file.  We may want to simply delete it.
-    if p == 'Infinity':
-        return np.max(np.abs(a))
-    else:
-        return np.sum(np.abs(a) ** p) ** (1 / p)
-
-
 @cbook.deprecated("2.2", 'numpy.arange')
 def frange(xini, xfin=None, delta=None, **kw):
     """
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -233,7 +233,7 @@
     demean, detrend, detrend_linear, detrend_mean, detrend_none,
     frange,
     identity, ispower2, isvector,
-    log2, movavg, norm_flat,
+    log2, movavg,
     window_hanning, window_none)
 
 from matplotlib import cbook, mlab, pyplot as plt
