summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorMark Wiebe <mwiebe@enthought.com>2011-05-20 11:40:40 -0500
committerMark Wiebe <mwiebe@enthought.com>2011-05-20 11:45:33 -0500
commit8949fe24c057973ece3940617d396addbcbf3875 (patch)
treeb6f50fe6f07dbd7a925a541c312f777298c75e7b /numpy/ma
parent7045cbc7e65dc13a1bb0d5ca866d455022e29f24 (diff)
downloadnumpy-8949fe24c057973ece3940617d396addbcbf3875.tar.gz
ENH: Tighten up dtype parsing in general, to catch some more invalid datetime results
There is also a problem with 'O4' and 'O8', which are platform-specific. I changed it to still accept both, but produce a deprecation warning.
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/core.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index bbd855cf8..2cb888d55 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -3527,10 +3527,10 @@ class MaskedArray(ndarray):
# convert to object array to make filled work
names = self.dtype.names
if names is None:
- res = self._data.astype("|O8")
+ res = self._data.astype("O")
res[m] = f
else:
- rdtype = _recursive_make_descr(self.dtype, "|O8")
+ rdtype = _recursive_make_descr(self.dtype, "O")
res = self._data.astype(rdtype)
_recursive_printoption(res, m, f)
else: