Remove mlab.isvector

dstansby · dstansby · commit dedc26964c90 · 2018-09-29T11:05:10.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
@@ -17,6 +17,7 @@ in Matplotlib 2.2 has been removed. See below for a list:
 - `mlab.binary_repr`
 - `mlab.ispower2`
 - `mlab.log2` (use numpy.log2 instead)
+- `mlab.isvector`
 - `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
@@ -1204,65 +1204,6 @@ def movavg(x, n):
     return np.convolve(x, w, mode='valid')
 
 
-# the following code was written and submitted by Fernando Perez
-# from the ipython numutils package under a BSD license
-# begin fperez functions
-
-"""
-A set of convenient utilities for numerical work.
-
-Most of this module requires numpy or is meant to be used with it.
-
-Copyright (c) 2001-2004, Fernando Perez. <Fernando.Perez@colorado.edu>
-All rights reserved.
-
-This license was generated from the BSD license template as found in:
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the IPython project nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""
-
-
-@cbook.deprecated("2.2")
-def isvector(X):
-    """
-    Like the MATLAB function with the same name, returns *True*
-    if the supplied numpy array or matrix *X* looks like a vector,
-    meaning it has a one non-singleton axis (i.e., it can have
-    multiple axes, but all must have length 1, except for one of
-    them).
-
-    If you just want to see if the array has 1 axis, use X.ndim == 1.
-    """
-    return np.prod(X.shape) == np.max(X.shape)
-
-# end fperez numutils code
-
-
 # helpers for loading, saving, manipulating and viewing numpy record arrays
 @cbook.deprecated("2.2", 'numpy.isnan')
 def safe_isnan(x):
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -231,7 +231,6 @@
 from matplotlib.mlab import (
     csv2rec,
     demean, detrend, detrend_linear, detrend_mean, detrend_none,
-    isvector,
     movavg,
     window_hanning, window_none)
 
