* force the domain to the shape of the other element in DomainedBinaryOperation (bugfix 857)

1 files changed, 4 insertions, 1 deletions

diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index b02b175d0..2236c3846 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -639,7 +639,10 @@ class _DomainedBinaryOperation:
         if t.any(None):
             mb = mask_or(mb, t)
             # The following line controls the domain filling
-            d2 = np.where(t,self.filly,d2)
+            if t.size == d2.size:
+                d2 = np.where(t,self.filly,d2)
+            else:
+                d2 = np.where(np.resize(t, d2.shape),self.filly, d2)
         m = mask_or(ma, mb)
         if (not m.ndim) and m:
             return masked