diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2010-08-15 19:11:00 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2010-08-15 19:11:00 +0000 |
| commit | cc5d13150ce5e03a3523320eeca26e41086a0074 (patch) | |
| tree | c9ed352aa923d0c2e8b7a81ef5f1315b77f200b0 /numpy/polynomial/chebyshev.py | |
| parent | a0f3609e88a998626309f63a9d1288fd591de6aa (diff) | |
| download | numpy-cc5d13150ce5e03a3523320eeca26e41086a0074.tar.gz | |
Merge branch 'poly'
Conflicts:
numpy/polynomial/chebyshev.py
numpy/polynomial/polynomial.py
Diffstat (limited to 'numpy/polynomial/chebyshev.py')
| -rw-r--r-- | numpy/polynomial/chebyshev.py | 9 |
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: |