diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 15:34:26 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-13 17:04:13 -0600 |
| commit | 0dfe67afd1ee9e4c905bf119673f6e634221f21b (patch) | |
| tree | a45a1e39de66d5d462a69040ea7e996cf234a011 /numpy/lib/tests/test_io.py | |
| parent | e589c6ed1dac7755bb7bd9e181a43ebeff62dcec (diff) | |
| download | numpy-0dfe67afd1ee9e4c905bf119673f6e634221f21b.tar.gz | |
2to3: Apply zip fixer.
In Python 3 zip returns an iterator instead of a list. Consequently, in
places where an iterator won't do it must be enclosed in list(...).
Lists instead of iterators are also used in array constructors as using
iterators there usually results in an object array containing an
iterator object.
Closes #3094
Diffstat (limited to 'numpy/lib/tests/test_io.py')
| -rw-r--r-- | numpy/lib/tests/test_io.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py index af4eed05d..5987a15b0 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -517,7 +517,7 @@ class TestLoadTxt(TestCase): c = TextIO(data) names = ['stid', 'temp'] dtypes = ['S4', 'f8'] - arr = np.loadtxt(c, usecols=(0, 2), dtype=zip(names, dtypes)) + arr = np.loadtxt(c, usecols=(0, 2), dtype=list(zip(names, dtypes))) assert_equal(arr['stid'], [b"JOE", b"BOB"]) assert_equal(arr['temp'], [25.3, 27.9]) @@ -1119,7 +1119,7 @@ M 33 21.99 data = TextIO("JOE 70.1 25.3\nBOB 60.5 27.9") names = ['stid', 'temp'] dtypes = ['S4', 'f8'] - test = np.ndfromtxt(data, usecols=(0, 2), dtype=zip(names, dtypes)) + test = np.ndfromtxt(data, usecols=(0, 2), dtype=list(zip(names, dtypes))) assert_equal(test['stid'], [b"JOE", b"BOB"]) assert_equal(test['temp'], [25.3, 27.9]) |