summaryrefslogtreecommitdiff
path: root/numpy/ma/extras.py
diff options
context:
space:
mode:
authorJaime <jaime.frio@gmail.com>2015-03-02 12:32:24 -0800
committerJaime <jaime.frio@gmail.com>2015-03-02 12:32:24 -0800
commit03506a9e72d85d596021e11e9b39c5a0fd1f2eba (patch)
treed5fd6bbe2d034e12a18c06f4299887166ed6ff81 /numpy/ma/extras.py
parent83b680b84a83c3e4b56e79396c395e30af650ba8 (diff)
parent6ca778d275ade854cfc81a6a975230c4ccd9402c (diff)
downloadnumpy-03506a9e72d85d596021e11e9b39c5a0fd1f2eba.tar.gz
Merge pull request #5622 from rmcgibbo/maint-docstrings
MAINT: Reconcile docstrings and function signatures where they disagree
Diffstat (limited to 'numpy/ma/extras.py')
-rw-r--r--numpy/ma/extras.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index b6082180a..ae4b5b374 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -730,6 +730,10 @@ def compress_rowcols(x, axis=None):
Parameters
----------
+ x : array_like, MaskedArray
+ The array to operate on. If not a MaskedArray instance (or if no array
+ elements are masked), `x` is interpreted as a MaskedArray with
+ `mask` set to `nomask`. Must be a 2D array.
axis : int, optional
Axis along which to perform the operation. Default is None.
@@ -1561,7 +1565,7 @@ def flatnotmasked_edges(a):
Parameters
----------
- arr : array_like
+ a : array_like
Input 1-D `MaskedArray`
Returns