summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorBen Walsh <b@wumpster.com>2011-07-12 17:50:48 +0100
committerMark Wiebe <mwiebe@enthought.com>2011-07-19 14:54:25 -0500
commit91646576e73d6cf9eb6ff4914292844ea40605f1 (patch)
treee77a0f5bc62a3ec7105782baac6f1560c21aadb7 /numpy/ma
parent1dd8eb73ec89b96d17cfd46dc98aae6d97762832 (diff)
downloadnumpy-91646576e73d6cf9eb6ff4914292844ea40605f1.tar.gz
ENH: datetime: Masked arrays now use NaT as default filler value.
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 72aa0b2c4..e2e954a97 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -143,8 +143,8 @@ default_filler = {'b': True,
'u' : 999999,
'V' : '???',
'U' : 'N/A',
- 'M8[D]' : np.datetime64('1970-01-01'),
- 'M8[us]' : np.datetime64('1970-01-01 00:00:00.000000Z')
+ 'M8[D]' : np.datetime64('NaT', 'D'),
+ 'M8[us]' : np.datetime64('NaT', 'us')
}
max_filler = ntypes._minvals
max_filler.update([(k, -np.inf) for k in [np.float32, np.float64]])