diff options
| author | pierregm <pierregm@localhost> | 2009-08-30 18:08:08 +0000 |
|---|---|---|
| committer | pierregm <pierregm@localhost> | 2009-08-30 18:08:08 +0000 |
| commit | bbe188eeb0b87d5ea08e2f142651d9cd1de652cd (patch) | |
| tree | eb549ae9c28888a04f0df9b76d4e045c58691798 /numpy/ma/core.py | |
| parent | cb955806a508ec15ebb83fa358f63a9dc67f7a16 (diff) | |
| download | numpy-bbe188eeb0b87d5ea08e2f142651d9cd1de652cd.tar.gz | |
* Bugfix for ticket #1207
Diffstat (limited to 'numpy/ma/core.py')
| -rw-r--r-- | numpy/ma/core.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 3071ff5fe..8321c5d1d 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -5309,7 +5309,7 @@ def where (condition, x=None, y=None): elif y is masked: ndtype = xv.dtype else: - ndtype = np.max([xv.dtype, yv.dtype]) + ndtype = np.find_common_type([xv.dtype, yv.dtype], []) # Construct an empty array and fill it d = np.empty(fc.shape, dtype=ndtype).view(MaskedArray) _data = d._data |