diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-05 21:43:22 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-03-27 18:42:34 -0600 |
| commit | 91aa03f4a1065319e85c6ee90306971c301fd58c (patch) | |
| tree | c4d40c32610eccebb71ad1f52c4f389c0d1b86b0 /numpy/core/numeric.py | |
| parent | 1a816c79f7212102634c28e0896547671d347a60 (diff) | |
| download | numpy-91aa03f4a1065319e85c6ee90306971c301fd58c.tar.gz | |
2to3: Replace xrange by range and use list(range(...)) where needed
In python3 range is an iterator and `xrange` has been removed. This has
two consequence for code:
1) Where a list is needed `list(range(...))` must be used.
2) `xrange` must be replaced by `range`
Both of these changes also work in python2 and this patch makes both.
There are three places fixed that do not need it, but I left them in
so that the result would be `xrange` clean.
Closes #3092
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) |