diff options
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 |