summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_index_tricks.py
diff options
context:
space:
mode:
authorTravis E. Oliphant <teoliphant@gmail.com>2013-01-10 00:26:34 -0600
committerTravis E. Oliphant <teoliphant@gmail.com>2013-01-11 00:53:58 -0600
commitaef2cf73aafc9a945d88cb9464f62135b177a2f4 (patch)
treea6a1260233373ea8ed8188a956713f8a441b8de8 /numpy/lib/tests/test_index_tricks.py
parent853eae4ef4b0b4e567924c964a1663789e597538 (diff)
downloadnumpy-aef2cf73aafc9a945d88cb9464f62135b177a2f4.tar.gz
Fix the test for numpy.ndindex()
Fix ndindex for 0-d arrays. Add tests for tuple arguments to ndindex
Diffstat (limited to 'numpy/lib/tests/test_index_tricks.py')
-rw-r--r--numpy/lib/tests/test_index_tricks.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 3cb06b4fb..43160ffb7 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -242,10 +242,16 @@ def test_ndindex():
expected = [ix for ix, e in np.ndenumerate(np.zeros((1, 2, 3)))]
assert_array_equal(x, expected)
+ x = list(np.ndindex((1, 2, 3)))
+ assert_array_equal(x, expected)
+
# Make sure size argument is optional
x = list(np.ndindex())
assert_equal(x, [()])
+ x = list(np.ndindex(()))
+ assert_equal(x, [()])
+
if __name__ == "__main__":
run_module_suite()