summaryrefslogtreecommitdiff
path: root/numpy/lib/polynomial.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib/polynomial.py')
-rw-r--r--numpy/lib/polynomial.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py
index 94da4784c..47078ae88 100644
--- a/numpy/lib/polynomial.py
+++ b/numpy/lib/polynomial.py
@@ -125,7 +125,7 @@ def poly(seq_of_zeros):
elif len(sh) == 1:
pass
else:
- raise ValueError, "input must be 1d or square 2d array."
+ raise ValueError("input must be 1d or square 2d array.")
if len(seq_of_zeros) == 0:
return 1.0
@@ -198,7 +198,7 @@ def roots(p):
# If input is scalar, this makes it an array
p = atleast_1d(p)
if len(p.shape) != 1:
- raise ValueError,"Input must be a rank-1 array."
+ raise ValueError("Input must be a rank-1 array.")
# find non-zero array entries
non_zero = NX.nonzero(NX.ravel(p))[0]
@@ -299,7 +299,7 @@ def polyint(p, m=1, k=None):
"""
m = int(m)
if m < 0:
- raise ValueError, "Order of integral must be positive (see polyder)"
+ raise ValueError("Order of integral must be positive (see polyder)")
if k is None:
k = NX.zeros(m, float)
k = atleast_1d(k)
@@ -377,7 +377,7 @@ def polyder(p, m=1):
"""
m = int(m)
if m < 0:
- raise ValueError, "Order of derivative must be positive (see polyint)"
+ raise ValueError("Order of derivative must be positive (see polyint)")
truepoly = isinstance(p, poly1d)
p = NX.asarray(p)
@@ -531,15 +531,15 @@ def polyfit(x, y, deg, rcond=None, full=False):
# check arguments.
if deg < 0 :
- raise ValueError, "expected deg >= 0"
+ raise ValueError("expected deg >= 0")
if x.ndim != 1:
- raise TypeError, "expected 1D vector for x"
+ raise TypeError("expected 1D vector for x")
if x.size == 0:
- raise TypeError, "expected non-empty vector for x"
+ raise TypeError("expected non-empty vector for x")
if y.ndim < 1 or y.ndim > 2 :
- raise TypeError, "expected 1D or 2D array for y"
+ raise TypeError("expected 1D or 2D array for y")
if x.shape[0] != y.shape[0] :
- raise TypeError, "expected x and y to have same length"
+ raise TypeError("expected x and y to have same length")
# set rcond
if rcond is None :
@@ -1010,7 +1010,7 @@ class poly1d(object):
c_or_r = poly(c_or_r)
c_or_r = atleast_1d(c_or_r)
if len(c_or_r.shape) > 1:
- raise ValueError, "Polynomial must be 1d only."
+ raise ValueError("Polynomial must be 1d only.")
c_or_r = trim_zeros(c_or_r, trim='f')
if len(c_or_r) == 0:
c_or_r = NX.array([0.])
@@ -1125,7 +1125,7 @@ class poly1d(object):
def __pow__(self, val):
if not isscalar(val) or int(val) != val or val < 0:
- raise ValueError, "Power to non-negative integers only."
+ raise ValueError("Power to non-negative integers only.")
res = [1]
for _ in range(val):
res = polymul(self.coeffs, res)
@@ -1164,7 +1164,7 @@ class poly1d(object):
return NX.any(self.coeffs != other.coeffs)
def __setattr__(self, key, val):
- raise ValueError, "Attributes cannot be changed this way."
+ raise ValueError("Attributes cannot be changed this way.")
def __getattr__(self, key):
if key in ['r', 'roots']:
@@ -1190,7 +1190,7 @@ class poly1d(object):
def __setitem__(self, key, val):
ind = self.order - key
if key < 0:
- raise ValueError, "Does not support negative powers."
+ raise ValueError("Does not support negative powers.")
if key > self.order:
zr = NX.zeros(key-self.order, self.coeffs.dtype)
self.__dict__['coeffs'] = NX.concatenate((zr, self.coeffs))