diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-28 07:10:01 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-28 07:10:01 -0700 |
| commit | 40742184df68fc01f3392c9865f35d5402e74b01 (patch) | |
| tree | 4d4832417a28e128ed989fc273d322a551d1cfdb /numpy/core/numeric.py | |
| parent | db75eb44a31fe1bb04a0f673fd459614bfd02b85 (diff) | |
| parent | b995d00e2e54bc6ff97f21bd179d1fc4dc3c92cb (diff) | |
| download | numpy-40742184df68fc01f3392c9865f35d5402e74b01.tar.gz | |
Merge pull request #3122 from charris/2to3-apply-xrange-fixer
2to3: Replace xrange by range and use list(range(...)) where needed
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index a114e4bb5..57e366efb 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -1040,8 +1040,8 @@ def tensordot(a, b, axes=2): try: iter(axes) except: - axes_a = range(-axes,0) - axes_b = range(0,axes) + axes_a = list(range(-axes,0)) + axes_b = list(range(0,axes)) else: axes_a, axes_b = axes try: @@ -1065,7 +1065,7 @@ def tensordot(a, b, axes=2): equal = True if (na != nb): equal = False else: - for k in xrange(na): + for k in range(na): if as_[axes_a[k]] != bs[axes_b[k]]: equal = False break @@ -1213,7 +1213,7 @@ def rollaxis(a, axis, start=0): start -= 1 if axis==start: return a - axes = range(0,n) + axes = list(range(0,n)) axes.remove(axis) axes.insert(start, axis) return a.transpose(axes) |