summaryrefslogtreecommitdiff
path: root/numpy/lib/tests
diff options
context:
space:
mode:
authorgfyoung <gfyoung@mit.edu>2016-01-12 23:16:57 +0000
committergfyoung <gfyoung@mit.edu>2016-01-14 19:05:31 +0000
commit02bcbd7e99f7b73c2abcb2726f79ea01a6bba2da (patch)
tree1ea2b8bfa8af4b3b99806933de189a83ef48e901 /numpy/lib/tests
parent8fa6e3bef26a6d4a2c92f2824129aa4409be2590 (diff)
downloadnumpy-02bcbd7e99f7b73c2abcb2726f79ea01a6bba2da.tar.gz
DOC, MAINT: Enforce np.ndarray arg for np.put and np.place
np.put and np.place do something only when the first argument is an instance of np.ndarray. These changes will cause a TypeError to be thrown in either function should that requirement not be satisfied.
Diffstat (limited to 'numpy/lib/tests')
-rw-r--r--numpy/lib/tests/test_function_base.py4
-rw-r--r--numpy/lib/tests/test_regression.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py
index a5ac78e33..88a590517 100644
--- a/numpy/lib/tests/test_function_base.py
+++ b/numpy/lib/tests/test_function_base.py
@@ -674,6 +674,10 @@ class TestExtins(TestCase):
assert_array_equal(b, [3, 2, 2, 3, 3])
def test_place(self):
+ # Make sure that non-np.ndarray objects
+ # raise an error instead of doing nothing
+ assert_raises(TypeError, place, [1, 2, 3], [True, False], [0, 1])
+
a = np.array([1, 4, 3, 2, 5, 8, 7])
place(a, [0, 1, 0, 1, 0, 1, 0], [2, 4, 6])
assert_array_equal(a, [1, 2, 3, 4, 5, 6, 7])
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py
index 00fa3f195..ee50dcfa4 100644
--- a/numpy/lib/tests/test_regression.py
+++ b/numpy/lib/tests/test_regression.py
@@ -85,10 +85,6 @@ class TestRegression(TestCase):
assert_(x != y)
assert_(x == x)
- def test_mem_insert(self, level=rlevel):
- # Ticket #572
- np.lib.place(1, 1, 1)
-
def test_polyfit_build(self):
# Ticket #628
ref = [-1.06123820e-06, 5.70886914e-04, -1.13822012e-01,