summaryrefslogtreecommitdiff
path: root/numpy/polynomial/chebyshev.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/polynomial/chebyshev.py')
-rw-r--r--numpy/polynomial/chebyshev.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/numpy/polynomial/chebyshev.py b/numpy/polynomial/chebyshev.py
index 5b51d233f..784caeab9 100644
--- a/numpy/polynomial/chebyshev.py
+++ b/numpy/polynomial/chebyshev.py
@@ -647,6 +647,13 @@ def chebmulx(cs):
out : ndarray
Array representing the result of the multiplication.
+<<<<<<< HEAD
+=======
+ Notes
+ -----
+ .. versionadded:: 1.5.0
+
+>>>>>>> poly
"""
# cs is a trimmed copy
[cs] = pu.as_series([cs])
@@ -978,7 +985,7 @@ def chebint(cs, m=1, k=[], lbnd=0, scl=1):
"""
cnt = int(m)
- if np.isscalar(k) :
+ if not np.iterable(k):
k = [k]
if cnt != m: