From 87596cf6a0e6becccea111727435605fa3615e49 Mon Sep 17 00:00:00 2001
From: Mark Wiebe <mwwiebe@gmail.com>
Date: Fri, 21 Jan 2011 00:54:09 -0800
Subject: ENH: ufunc: Make many more tests pass with the new ufunc code

---
 numpy/ma/core.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'numpy/ma')

diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 98100621e..673cfb1ab 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -940,7 +940,9 @@ class _MaskedBinaryOperation:
         # Revert result to da where masked
         if m.any():
             np.putmask(result, m, 0)
-            result += m * da
+            # This only makes sense if the operation preserved the dtype
+            if result.dtype == da.dtype:
+                result += m * da
         # Transforms to a (subclass of) MaskedArray
         result = result.view(get_masked_subclass(a, b))
         result._mask = m
-- 
cgit v1.2.1