Merge branch 'poly'

Conflicts:
	numpy/polynomial/chebyshev.py
	numpy/polynomial/polynomial.py

5 files changed, 20 insertions, 7 deletions

diff --git a/doc/release/1.5.0-notes.rst b/doc/release/1.5.0-notes.rst
index 9a70f327c..460c16b7a 100644
--- a/doc/release/1.5.0-notes.rst
+++ b/doc/release/1.5.0-notes.rst
@@ -94,6 +94,7 @@ polynomial.polynomial
   Polynomial domain can be specified by using [] as the domain value.
 * Weights can be used in both polyfit and Polynomial.fit
 * A linspace method has been added to the Polynomial class to ease plotting.
+* The polymulx function was added.
 
 polynomial.chebyshev
 --------------------
@@ -109,6 +110,8 @@ polynomial.chebyshev
   Chebyshev domain can be specified by using [] as the domain value.
 * Weights can be used in both chebfit and Chebyshev.fit
 * A linspace method has been added to the Chebyshev class to ease plotting.
+* The chebmulx function was added.
+
 
 histogram
 ---------
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 3881c8882..f37228a22 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -722,7 +722,7 @@ def savetxt(fname, X, fmt='%.18e', delimiter=' ', newline='\n'):
     delimiter : str
         Character separating columns.
     newline : str
-        .. versionadded:: 2.0
+        .. versionadded:: 1.5.0
 
         Character separating lines.
 
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:
diff --git a/numpy/polynomial/polynomial.py b/numpy/polynomial/polynomial.py
index a53f02343..6b5b7be98 100644
--- a/numpy/polynomial/polynomial.py
+++ b/numpy/polynomial/polynomial.py
@@ -283,6 +283,10 @@ def polymulx(cs):
     out : ndarray
         Array representing the result of the multiplication.
 
+    Notes
+    -----
+    .. versionadded:: 1.5.0
+
     """
     # cs is a trimmed copy
     [cs] = pu.as_series([cs])
@@ -544,8 +548,7 @@ def polyint(cs, m=1, k=[], lbnd=0, scl=1):
     Raises
     ------
     ValueError
-        If ``m < 1``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 1``, ``len(k) > m``.
 
     See Also
     --------
@@ -577,7 +580,7 @@ def polyint(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:
diff --git a/numpy/polynomial/polytemplate.py b/numpy/polynomial/polytemplate.py
index 75b1b4eb1..13f77ba30 100644
--- a/numpy/polynomial/polytemplate.py
+++ b/numpy/polynomial/polytemplate.py
@@ -308,7 +308,7 @@ class $name(pu.PolyBase) :
 
         Notes
         -----
-        .. versionadded:: 2.0.0
+        .. versionadded:: 1.5.0
 
         """
         return len(self) - 1
@@ -335,7 +335,7 @@ class $name(pu.PolyBase) :
 
         Notes
         -----
-        .. versionadded:: 2.0.0
+        .. versionadded:: 1.5.0
 
         """
         return self.truncate(deg + 1)