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_recfunctions.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_recfunctions.py')
| -rw-r--r-- | numpy/lib/tests/test_recfunctions.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py index 899031451..ef22ca413 100644 --- a/numpy/lib/tests/test_recfunctions.py +++ b/numpy/lib/tests/test_recfunctions.py @@ -543,11 +543,11 @@ class TestStackArrays(TestCase): class TestJoinBy(TestCase): def setUp(self): - self.a = np.array(zip(np.arange(10), np.arange(50, 60), - np.arange(100, 110)), + self.a = np.array(list(zip(np.arange(10), np.arange(50, 60), + np.arange(100, 110))), dtype=[('a', int), ('b', int), ('c', int)]) - self.b = np.array(zip(np.arange(5, 15), np.arange(65, 75), - np.arange(100, 110)), + self.b = np.array(list(zip(np.arange(5, 15), np.arange(65, 75), + np.arange(100, 110))), dtype=[('a', int), ('b', int), ('d', int)]) # def test_inner_join(self): @@ -620,11 +620,11 @@ class TestJoinBy(TestCase): class TestJoinBy2(TestCase): @classmethod def setUp(cls): - cls.a = np.array(zip(np.arange(10), np.arange(50, 60), - np.arange(100, 110)), + cls.a = np.array(list(zip(np.arange(10), np.arange(50, 60), + np.arange(100, 110))), dtype=[('a', int), ('b', int), ('c', int)]) - cls.b = np.array(zip(np.arange(10), np.arange(65, 75), - np.arange(100, 110)), + cls.b = np.array(list(zip(np.arange(10), np.arange(65, 75), + np.arange(100, 110))), dtype=[('a', int), ('b', int), ('d', int)]) def test_no_r1postfix(self): @@ -660,12 +660,12 @@ class TestJoinBy2(TestCase): assert_equal(test, control) def test_two_keys_two_vars(self): - a = np.array(zip(np.tile([10,11],5),np.repeat(np.arange(5),2), - np.arange(50, 60), np.arange(10,20)), + a = np.array(list(zip(np.tile([10,11],5),np.repeat(np.arange(5),2), + np.arange(50, 60), np.arange(10,20))), dtype=[('k', int), ('a', int), ('b', int),('c',int)]) - b = np.array(zip(np.tile([10,11],5),np.repeat(np.arange(5),2), - np.arange(65, 75), np.arange(0,10)), + b = np.array(list(zip(np.tile([10,11],5),np.repeat(np.arange(5),2), + np.arange(65, 75), np.arange(0,10))), dtype=[('k', int), ('a', int), ('b', int), ('c',int)]) control = np.array([(10, 0, 50, 65, 10, 0), (11, 0, 51, 66, 11, 1), |