diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 08:36:46 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-01 08:36:46 -0700 |
| commit | 02cfcb99bc976a0bfc39529999e2a0200fb9cc2a (patch) | |
| tree | a2a2210d560d5696e47a5dcf5d969faa8d21ad79 /numpy/oldnumeric/arrayfns.py | |
| parent | d1e692d70da7532b02d752d0842987333bd76c70 (diff) | |
| parent | 3655b732bd08022dab8498b44191d6c4049bc7a8 (diff) | |
| download | numpy-02cfcb99bc976a0bfc39529999e2a0200fb9cc2a.tar.gz | |
Merge branch '2to3-raise'
Use modern raise syntax for python 3 compatibility.
* 2to3-raise:
2to3: Apply `raise` fixes. Closes #3077.
Diffstat (limited to 'numpy/oldnumeric/arrayfns.py')
| -rw-r--r-- | numpy/oldnumeric/arrayfns.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/oldnumeric/arrayfns.py b/numpy/oldnumeric/arrayfns.py index 683ed309d..54992de57 100644 --- a/numpy/oldnumeric/arrayfns.py +++ b/numpy/oldnumeric/arrayfns.py @@ -20,7 +20,7 @@ def array_set(vals1, indices, vals2): vals1 = asarray(vals1) vals2 = asarray(vals2) if vals1.ndim != vals2.ndim or vals1.ndim < 1: - raise error, "vals1 and vals2 must have same number of dimensions (>=1)" + raise error("vals1 and vals2 must have same number of dimensions (>=1)") vals1[indices] = vals2 from numpy import digitize @@ -38,7 +38,7 @@ def interp(y, x, z, typ=None): if typ == 'f': return res.astype('f') - raise error, "incompatible typecode" + raise error("incompatible typecode") def nz(x): x = asarray(x,dtype=np.ubyte) |