Docstrings, further expanding test

numpy · eric-wieser · May 5, 2017 · Dec 28, 2016 · Dec 31, 2016 · Feb 15, 2017
commit 545df63981a66f38c42c5962d2cf6870ebfe3712
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
@@ -389,9 +389,8 @@ def in1d(ar1, ar2, assume_unique=False, invert=False):
     Returns a boolean array the same length as `ar1` that is True
     where an element of `ar1` is in `ar2` and False otherwise.
 
-    This function has been deprecated: use `isin` instead.
-
-    Deprecated since version 1.13.0.
+    .. deprecated:: 1.13.0
+                    Replaced by :func:`isin`.
 
     Parameters
     ----------

diff --git a/numpy/lib/tests/test_arraysetops.py b/numpy/lib/tests/test_arraysetops.py
@@ -97,20 +97,19 @@ def assert_isin_equal(a, b):
         c = [(9, 8), (7, 6)]
         d = (9, 7)
         assert_isin_equal(c, d)
-        #zero-d scalar as:
-        #1st arg
+        #zero-d array:
+        f = np.array([3])
+        assert_isin_equal(f, b)
+        assert_isin_equal(a, f)
+        assert_isin_equal(f, f)
+        #scalar:
         assert_isin_equal(5, b)
-        #2nd arg
         assert_isin_equal(a, 6)
-        #both args
         assert_isin_equal(5, 6)
-        #empty array-like as:
+        #empty array-like:
         x = []
-        #1st arg
         assert_isin_equal(x, b)
-        #2nd arg
         assert_isin_equal(a, x)
-        #both args
         assert_isin_equal(x, x)
 
     def test_in1d(self):

diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
@@ -1145,10 +1145,8 @@ def in1d(ar1, ar2, assume_unique=False, invert=False):
 
     The output is always a masked array. See `numpy.in1d` for more details.
 
-    This function has been deprecated: use `isin` instead.
-
-    Deprecated since version 1.13.0.
-
+    .. deprecated:: 1.13.0
+                    Replaced by :func:`isin`.
 
     See Also
     --------