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/lib/npyio.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/lib/npyio.py')
| -rw-r--r-- | numpy/lib/npyio.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index ca410a24a..bd96a17f6 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -780,7 +780,7 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, defconv = _getconv(dtype) # Skip the first `skiprows` lines - for i in xrange(skiprows): + for i in range(skiprows): fh.next() # Read until we find a line with some values, and use @@ -804,7 +804,7 @@ def loadtxt(fname, dtype=float, comments='#', delimiter=None, converters = [_getconv(dt) for dt in dtype_types] else: # All fields have the same dtype - converters = [defconv for i in xrange(N)] + converters = [defconv for i in range(N)] if N > 1: packing = [(N, tuple)] @@ -1339,7 +1339,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, DeprecationWarning) skip_header = skiprows # Skip the first `skip_header` rows - for i in xrange(skip_header): + for i in range(skip_header): fhd.next() # Keep on until we find the first valid values |