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_recfunctions.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_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), |