summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_arraysetops.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-14 07:41:43 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-04-14 07:41:43 -0700
commit3f2c789ffd0d2e05596b15ea6cd644262f96200e (patch)
tree3ada9d38eaf9f5de1cd8e2529e73d163cd19d112 /numpy/lib/tests/test_arraysetops.py
parent61c5ac6758d05da6cf49b7247eca850d9db83a7a (diff)
parent0dfe67afd1ee9e4c905bf119673f6e634221f21b (diff)
downloadnumpy-3f2c789ffd0d2e05596b15ea6cd644262f96200e.tar.gz
Merge pull request #3244 from charris/2to3-apply-zip-fixer
2to3: Apply zip fixer.
Diffstat (limited to 'numpy/lib/tests/test_arraysetops.py')
-rw-r--r--numpy/lib/tests/test_arraysetops.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py
index f7f75922d..4ba6529e4 100644
--- a/numpy/lib/tests/test_arraysetops.py
+++ b/numpy/lib/tests/test_arraysetops.py
@@ -61,8 +61,8 @@ class TestSetOps(TestCase):
# test for structured arrays
dt = [('', 'i'), ('', 'i')]
- aa = np.array(zip(a,a), dt)
- bb = np.array(zip(b,b), dt)
+ aa = np.array(list(zip(a,a)), dt)
+ bb = np.array(list(zip(b,b)), dt)
check_all(aa, bb, i1, i2, dt)