Skip to content

Commit 6d569ae

Browse files
committed
BUG: Non-bool result when comparing ma scalars.
Removed logic replacing masked scalar results from ufuncs with ma.masked singleton which has dtype float64. Fixes numpy#4332.
1 parent 34d7bee commit 6d569ae

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

‎numpy/ma/core.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2840,12 +2840,8 @@ def __array_wrap__(self, obj, context=None):
28402840
else:
28412841
# Don't modify inplace, we risk back-propagation
28422842
m = (m | d)
2843-
# Make sure the mask has the proper size
2844-
if result.shape == () and m:
2845-
return masked
2846-
else:
2847-
result._mask = m
2848-
result._sharedmask = False
2843+
result._mask = m
2844+
result._sharedmask = False
28492845
#....
28502846
return result
28512847

‎numpy/ma/tests/test_core.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,9 @@ def test_masked_singleton_arithmetic(self):
729729
self.assertTrue((-xm).mask)
730730
self.assertTrue(maximum(xm, xm).mask)
731731
self.assertTrue(minimum(xm, xm).mask)
732+
# Issue #4332
733+
self.assertEqual((xm > 0).dtype, np.dtype(bool))
734+
732735

733736
def test_masked_singleton_equality(self):
734737
# Tests (in)equality on masked snigleton

0 commit comments

Comments
 (0)