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/core | |
| 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/core')
| -rw-r--r-- | numpy/core/tests/test_getlimits.py | 4 | ||||
| -rw-r--r-- | numpy/core/tests/test_nditer.py | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_ufunc.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/tests/test_getlimits.py b/numpy/core/tests/test_getlimits.py index a07793658..96ca66b10 100644 --- a/numpy/core/tests/test_getlimits.py +++ b/numpy/core/tests/test_getlimits.py @@ -43,10 +43,10 @@ class TestLongdouble(TestCase): class TestIinfo(TestCase): def test_basic(self): - dts = zip(['i1', 'i2', 'i4', 'i8', + dts = list(zip(['i1', 'i2', 'i4', 'i8', 'u1', 'u2', 'u4', 'u8'], [np.int8, np.int16, np.int32, np.int64, - np.uint8, np.uint16, np.uint32, np.uint64]) + np.uint8, np.uint16, np.uint32, np.uint64])) for dt1, dt2 in dts: assert_equal(iinfo(dt1).min, iinfo(dt2).min) assert_equal(iinfo(dt1).max, iinfo(dt2).max) diff --git a/numpy/core/tests/test_nditer.py b/numpy/core/tests/test_nditer.py index d27920229..45fcc2791 100644 --- a/numpy/core/tests/test_nditer.py +++ b/numpy/core/tests/test_nditer.py @@ -1572,7 +1572,7 @@ def test_iter_buffering_delayed_alloc(): assert_equal(i[0], 0) i[1] = 1 assert_equal(i[0:2], [0,1]) - assert_equal([[x[0][()],x[1][()]] for x in i], zip(list(range(6)), [1]*6)) + assert_equal([[x[0][()],x[1][()]] for x in i], list(zip(range(6), [1]*6))) def test_iter_buffered_cast_simple(): # Test that buffering can handle a simple cast diff --git a/numpy/core/tests/test_ufunc.py b/numpy/core/tests/test_ufunc.py index 82f52d777..4ae1f04a6 100644 --- a/numpy/core/tests/test_ufunc.py +++ b/numpy/core/tests/test_ufunc.py @@ -20,7 +20,7 @@ class TestUfunc(TestCase): def test_reduceat_shifting_sum(self) : L = 6 x = np.arange(L) - idx = np.array(zip(np.arange(L-2), np.arange(L-2)+2)).ravel() + idx = np.array(list(zip(np.arange(L - 2), np.arange(L - 2) + 2))).ravel() assert_array_equal(np.add.reduceat(x,idx)[::2], [1,3,5,7]) def test_generic_loops(self) : |