Merge pull request #9899 from eric-wieser/remove-isscalar

Remove unused isscalar imports, and incorrect documentation using it

7 files changed, 12 insertions, 12 deletions

diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 53578e0e4..deab938ea 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -4,7 +4,7 @@ import warnings
 
 import numpy.core.numeric as _nx
 from numpy.core.numeric import (
-    asarray, zeros, outer, concatenate, isscalar, array, asanyarray
+    asarray, zeros, outer, concatenate, array, asanyarray
     )
 from numpy.core.fromnumeric import product, reshape, transpose
 from numpy.core.multiarray import normalize_axis_index
diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py
index 2f738c8a6..8f2e45fa5 100644
--- a/numpy/linalg/linalg.py
+++ b/numpy/linalg/linalg.py
@@ -23,7 +23,7 @@ from numpy.core import (
     csingle, cdouble, inexact, complexfloating, newaxis, ravel, all, Inf, dot,
     add, multiply, sqrt, maximum, fastCopyAndTranspose, sum, isfinite, size,
     finfo, errstate, geterrobj, longdouble, moveaxis, amin, amax, product, abs,
-    broadcast, atleast_2d, intp, asanyarray, isscalar, object_, ones, matmul,
+    broadcast, atleast_2d, intp, asanyarray, object_, ones, matmul,
     swapaxes, divide, count_nonzero
 )
 from numpy.core.multiarray import normalize_axis_index
diff --git a/numpy/polynomial/chebyshev.py b/numpy/polynomial/chebyshev.py
index fe2805a03..0aaae9b59 100644
--- a/numpy/polynomial/chebyshev.py
+++ b/numpy/polynomial/chebyshev.py
@@ -1012,8 +1012,8 @@ def chebint(c, m=1, k=[], lbnd=0, scl=1, axis=0):
     Raises
     ------
     ValueError
-        If ``m < 1``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 1``, ``len(k) > m``, ``np.ndim(lbnd) != 0``, or
+         ``np.ndim(scl) != 0``.
 
     See Also
     --------
diff --git a/numpy/polynomial/hermite.py b/numpy/polynomial/hermite.py
index ae1143d28..ba8af061e 100644
--- a/numpy/polynomial/hermite.py
+++ b/numpy/polynomial/hermite.py
@@ -770,8 +770,8 @@ def hermint(c, m=1, k=[], lbnd=0, scl=1, axis=0):
     Raises
     ------
     ValueError
-        If ``m < 0``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 0``, ``len(k) > m``, ``np.ndim(lbnd) != 0``, or
+         ``np.ndim(scl) != 0``.
 
     See Also
     --------
diff --git a/numpy/polynomial/hermite_e.py b/numpy/polynomial/hermite_e.py
index ee29ec5d3..6b81e68b7 100644
--- a/numpy/polynomial/hermite_e.py
+++ b/numpy/polynomial/hermite_e.py
@@ -769,8 +769,8 @@ def hermeint(c, m=1, k=[], lbnd=0, scl=1, axis=0):
     Raises
     ------
     ValueError
-        If ``m < 0``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 0``, ``len(k) > m``, ``np.ndim(lbnd) != 0``, or
+         ``np.ndim(scl) != 0``.
 
     See Also
     --------
diff --git a/numpy/polynomial/laguerre.py b/numpy/polynomial/laguerre.py
index 079cf97b3..ba184638d 100644
--- a/numpy/polynomial/laguerre.py
+++ b/numpy/polynomial/laguerre.py
@@ -770,8 +770,8 @@ def lagint(c, m=1, k=[], lbnd=0, scl=1, axis=0):
     Raises
     ------
     ValueError
-        If ``m < 0``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 0``, ``len(k) > m``, ``np.ndim(lbnd) != 0``, or
+         ``np.ndim(scl) != 0``.
 
     See Also
     --------
diff --git a/numpy/polynomial/legendre.py b/numpy/polynomial/legendre.py
index 1c42f4881..b6664d25b 100644
--- a/numpy/polynomial/legendre.py
+++ b/numpy/polynomial/legendre.py
@@ -810,8 +810,8 @@ def legint(c, m=1, k=[], lbnd=0, scl=1, axis=0):
     Raises
     ------
     ValueError
-        If ``m < 0``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 0``, ``len(k) > m``, ``np.ndim(lbnd) != 0``, or
+         ``np.ndim(scl) != 0``.
 
     See Also
     --------