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/numarray/functions.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/numarray/functions.py')
-rw-r--r-- | numpy/numarray/functions.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/numarray/functions.py b/numpy/numarray/functions.py index 7242f2870..734d5c5a5 100644 --- a/numpy/numarray/functions.py +++ b/numpy/numarray/functions.py @@ -155,7 +155,7 @@ class FileSeekWarning(Warning): pass -STRICT, SLOPPY, WARN = range(3) +STRICT, SLOPPY, WARN = list(range(3)) _BLOCKSIZE=1024 @@ -405,7 +405,7 @@ def put(array, indices, values, axis=0, clipmode=RAISE): work[indices] = values work = work.swapaxes(0, axis) else: - def_axes = range(work.ndim) + def_axes = list(range(work.ndim)) for x in axis: def_axes.remove(x) axis = list(axis)+def_axes @@ -441,7 +441,7 @@ def take(array, indices, axis=0, outarr=None, clipmode=RAISE): return res return else: - def_axes = range(array.ndim) + def_axes = list(range(array.ndim)) for x in axis: def_axes.remove(x) axis = list(axis) + def_axes |