diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:41:43 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-14 07:41:43 -0700 |
| commit | 3f2c789ffd0d2e05596b15ea6cd644262f96200e (patch) | |
| tree | 3ada9d38eaf9f5de1cd8e2529e73d163cd19d112 /numpy/lib/tests/test_io.py | |
| parent | 61c5ac6758d05da6cf49b7247eca850d9db83a7a (diff) | |
| parent | 0dfe67afd1ee9e4c905bf119673f6e634221f21b (diff) | |
| download | numpy-3f2c789ffd0d2e05596b15ea6cd644262f96200e.tar.gz | |
Merge pull request #3244 from charris/2to3-apply-zip-fixer
2to3: Apply zip fixer.
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]) |