Some more deprecations

dstansby · dstansby · commit 924788852d8d · 2017-09-08T20:45:47.000+01:00
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -186,8 +186,7 @@
     long = int
 
 
-@cbook.deprecated("2.1",
-                  alternative='np.logspace(np.log(xmin), np.log(xmax), N)')
+@cbook.deprecated("2.2", alternative='np.logspace, np.geomspace')
 def logspace(xmin, xmax, N):
     '''
     Return N values logarithmically spaced between xmin and xmax.
@@ -196,6 +195,7 @@ def logspace(xmin, xmax, N):
     return np.exp(np.linspace(np.log(xmin), np.log(xmax), N))
 
 
+@cbook.deprecated("2.2", alternative='np.sqrt')
 def _norm(x):
     '''
     Return sqrt(x dot x).
@@ -2050,6 +2050,7 @@ def movavg(x, n):
 exp_safe_MAX = 1.7976931348623157e+308
 
 
+@cbook.deprecated("2.2")
 def exp_safe(x):
     """
     Compute exponentials which safely underflow to zero.
@@ -2065,6 +2066,7 @@ def exp_safe(x):
         return math.exp(x)
 
 
+@cbook.deprecated("2.2", alternative='np.array(list(map(fn, *args)))')
 def amap(fn, *args):
     """
     amap(function, sequence[, sequence, ...]) -> array.
@@ -2075,13 +2077,15 @@ def amap(fn, *args):
     return np.array(list(map(fn, *args)))
 
 
+@cbook.deprecated("2.2")
 def rms_flat(a):
     """
     Return the root mean square of all the elements of *a*, flattened out.
     """
     return np.sqrt(np.mean(np.abs(a) ** 2))
 
 
+@cbook.deprecated("2.2", alternative='np.linalg.norm(a, ord=1)')
 def l1norm(a):
     """
     Return the *l1* norm of *a*, flattened out.
@@ -2091,6 +2095,7 @@ def l1norm(a):
     return np.sum(np.abs(a))
 
 
+@cbook.deprecated("2.2", alternative='np.linalg.norm(a, ord=2)')
 def l2norm(a):
     """
     Return the *l2* norm of *a*, flattened out.
@@ -2100,6 +2105,7 @@ def l2norm(a):
     return np.sqrt(np.sum(np.abs(a) ** 2))
 
 
+@cbook.deprecated("2.2", alternative='np.linalg.norm(a.flat, ord=p)')
 def norm_flat(a, p=2):
     """
     norm(a,p=2) -> l-p norm of a.flat
@@ -2185,6 +2191,7 @@ def frange(xini, xfin=None, delta=None, **kw):
 # end frange()
 
 
+@cbook.deprecated("2.2")
 def identity(n, rank=2, dtype='l', typecode=None):
     """
     Returns the identity matrix of shape (*n*, *n*, ..., *n*) (rank *r*).
@@ -2248,6 +2255,7 @@ def binary_repr(number, max_length=1025):
     return ''.join(map(repr, digits)).replace('L', '')
 
 
+@cbook.deprecated("2.2")
 def log2(x, ln2=math.log(2.0)):
     """
     Return the log(*x*) in base 2.
@@ -2266,6 +2274,7 @@ def log2(x, ln2=math.log(2.0)):
             return len(bin_n)
 
 
+@cbook.deprecated("2.2")
 def ispower2(n):
     """
     Returns the log base 2 of *n* if *n* is a power of 2, zero otherwise.
@@ -2280,6 +2289,7 @@ def ispower2(n):
         return len(bin_n)
 
 
+@cbook.deprecated("2.2")
 def isvector(X):
     """
     Like the MATLAB function with the same name, returns *True*
@@ -2296,7 +2306,7 @@ def isvector(X):
 
 
 # helpers for loading, saving, manipulating and viewing numpy record arrays
-
+@cbook.deprecated("2.2")
 def safe_isnan(x):
     ':func:`numpy.isnan` for arbitrary types'
     if isinstance(x, six.string_types):
@@ -2311,6 +2321,7 @@ def safe_isnan(x):
         return b
 
 
+@cbook.deprecated("2.2")
 def safe_isinf(x):
     ':func:`numpy.isinf` for arbitrary types'
     if isinstance(x, six.string_types):
@@ -3028,6 +3039,7 @@ def __init__(self, precision=4):
         FormatFloat.__init__(self, precision, scale=1e-6)
 
 
+@cbook.deprecated("2.2", date.strftime)
 class FormatDate(FormatObj):
     def __init__(self, fmt):
         self.fmt = fmt
@@ -3045,6 +3057,7 @@ def fromstr(self, x):
         return dateutil.parser.parse(x).date()
 
 
+@cbook.deprecated("2.2", datetime.strftime)
 class FormatDatetime(FormatDate):
     def __init__(self, fmt='%Y-%m-%d %H:%M:%S'):
         FormatDate.__init__(self, fmt)
@@ -3088,6 +3101,7 @@ def csvformat_factory(format):
     return format
 
 
+@cbook.deprecated("2.2", alternative=np.recarray.tofile)
 def rec2txt(r, header=None, padding=3, precision=3, fields=None):
     """
     Returns a textual representation of a record array.
@@ -3208,6 +3222,7 @@ def format(item, just_pad_prec_spacer):
     return text
 
 
+@cbook.deprecated("2.2", alternative=np.recarray.tofile)
 def rec2csv(r, fname, delimiter=',', formatd=None, missing='',
             missingd=None, withheader=True):
     """
@@ -3447,6 +3462,7 @@ def less_simple_linear_interpolation(x, y, xi, extrap=False):
     return yi
 
 
+@cbook.deprecated("2.2")
 def slopes(x, y):
     """
     :func:`slopes` calculates the slope *y*'(*x*)
@@ -3488,6 +3504,7 @@ def slopes(x, y):
     return yp
 
 
+@cbook.deprecated("2.2")
 def stineman_interp(xi, x, y, yp=None):
     """
     Given data vectors *x* and *y*, the slope vector *yp* and a new
@@ -3743,6 +3760,7 @@ def evaluate(self, points):
 ##################################################
 # Code related to things in and around polygons
 ##################################################
+@cbook.deprecated("2.2")
 def inside_poly(points, verts):
     """
     *points* is a sequence of *x*, *y* points.
@@ -3788,6 +3806,7 @@ def poly_below(xmin, xs, ys):
     return x, y
 
 
+@cbook.deprecated("2.2")
 def poly_between(x, ylower, yupper):
     """
     Given a sequence of *x*, *ylower* and *yupper*, return the polygon
@@ -3850,6 +3869,7 @@ def contiguous_regions(mask):
     return list(zip(idx[::2], idx[1::2]))
 
 
+@cbook.deprecated("2.2")
 def cross_from_below(x, threshold):
     """
     return the indices into *x* where *x* crosses some threshold from
@@ -3891,6 +3911,7 @@ def cross_from_below(x, threshold):
         return ind
 
 
+@cbook.deprecated("2.2")
 def cross_from_above(x, threshold):
     """
     return the indices into *x* where *x* crosses some threshold from
@@ -3914,6 +3935,7 @@ def cross_from_above(x, threshold):
 ##################################################
 # Vector and path length geometry calculations
 ##################################################
+@cbook.deprecated("2.2", alternative='np.linalg.norm')
 def vector_lengths(X, P=2., axis=None):
     """
     Finds the length of a set of vectors in *n* dimensions.  This is
@@ -3937,7 +3959,7 @@ def distances_along_curve(X):
     distance.
     """
     X = np.diff(X, axis=0)
-    return vector_lengths(X, axis=1)
+    return np.linalg.norm(X, axis=1)
 
 
 def path_length(X):
@@ -3969,6 +3991,7 @@ def quad2cubic(q0x, q0y, q1x, q1y, q2x, q2y):
     return q0x, q0y, c1x, c1y, c2x, c2y, q2x, q2y
 
 
+@cbook.deprecated("2.2")
 def offset_line(y, yerr):
     """
     Offsets an array *y* by +/- an error and returns a tuple
