summaryrefslogtreecommitdiff
path: root/numpy/ma/extras.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-03-26 20:33:38 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-03-26 20:33:38 -0600
commit46767a2ffc6bf7b3c6841bd9b10f1f26543d22b7 (patch)
treef3078d9e2951f9cb65442e774c3b0e23b514e3e1 /numpy/ma/extras.py
parent69238dd8c223e447a42eac8a9ed10a0662dcdbef (diff)
parenta49c2797c84825e397de1a5dea4daf0b6db3f160 (diff)
downloadnumpy-46767a2ffc6bf7b3c6841bd9b10f1f26543d22b7.tar.gz
Merge pull request #4045 from abalkin/gh-4043
ENH: ma.asarray() and ma.asanyarray() will pass through input of the cor...
Diffstat (limited to 'numpy/ma/extras.py')
-rw-r--r--numpy/ma/extras.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py
index c2d105584..7182bf4ae 100644
--- a/numpy/ma/extras.py
+++ b/numpy/ma/extras.py
@@ -842,9 +842,9 @@ def mask_rowcols(a, axis=None):
fill_value=999999)
"""
- a = asarray(a)
+ a = array(a, subok=False)
if a.ndim != 2:
- raise NotImplementedError("compress2d works for 2D arrays only.")
+ raise NotImplementedError("mask_rowcols works for 2D arrays only.")
m = getmask(a)
# Nothing is masked: return a
if m is nomask or not m.any():