summaryrefslogtreecommitdiff
path: root/numpy/ma/core.py
diff options
context:
space:
mode:
authorJulian Taylor <juliantaylor108@gmail.com>2014-07-23 19:49:30 +0200
committerJulian Taylor <juliantaylor108@gmail.com>2014-07-23 19:49:30 +0200
commit236ca8b7e989241d846ed5cac38ec87f3943c5d9 (patch)
tree2e100daf2b925aa68285c111cf0eae339aebb805 /numpy/ma/core.py
parentc96bc5d3922ca91a4734b072a7bfd4fd3b5b8602 (diff)
parent4ed00c7e3b3206d4abf5536d4d0014fb08d22bc2 (diff)
downloadnumpy-236ca8b7e989241d846ed5cac38ec87f3943c5d9.tar.gz
Merge pull request #4866 from mhvk/ma/mvoid-initialisation
BUG Masked recarray assignment with [row][record] does not work
Diffstat (limited to 'numpy/ma/core.py')
-rw-r--r--numpy/ma/core.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index b69424094..5684bf8fd 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -5586,9 +5586,8 @@ class mvoid(MaskedArray):
"""
#
def __new__(self, data, mask=nomask, dtype=None, fill_value=None,
- hardmask=False):
- dtype = dtype or data.dtype
- _data = np.array(data, dtype=dtype)
+ hardmask=False, copy=False, subok=True):
+ _data = np.array(data, copy=copy, subok=subok, dtype=dtype)
_data = _data.view(self)
_data._hardmask = hardmask
if mask is not nomask: