From cd7233d7bcf53617b260ced54d52b114f93abcd9 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 6 Dec 2016 06:56:50 -0500 Subject: [PATCH] COMPAT: numpy compat with 1-ndim object array compat and broadcasting xref #14808 --- pandas/core/ops.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandas/core/ops.py b/pandas/core/ops.py index 96b447cda4bc4..7c5ad04cc90b0 100644 --- a/pandas/core/ops.py +++ b/pandas/core/ops.py @@ -1176,6 +1176,13 @@ def na_op(x, y): yrav = y.ravel() mask = notnull(xrav) & notnull(yrav) xrav = xrav[mask] + + # we may need to manually + # broadcast a 1 element array + if yrav.shape != mask.shape: + yrav = np.empty(mask.shape, dtype=yrav.dtype) + yrav.fill(yrav.item()) + yrav = yrav[mask] if np.prod(xrav.shape) and np.prod(yrav.shape): with np.errstate(all='ignore'):