summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2014-07-25 00:20:53 +0300
committerMarten van Kerkwijk <mhvk@astro.utoronto.ca>2015-04-04 21:47:01 -0400
commit6ba4fed3aa26979734faa462e172959fad69723b (patch)
tree2c3a8ecf2e0a2e5653743744dd3ecff33c5b70bf
parent367b4094125062fa9018db0f310b28780259f29b (diff)
downloadnumpy-6ba4fed3aa26979734faa462e172959fad69723b.tar.gz
BUG: core: inplace ops don't have corresponding rhs ops, so no need to check the slot
-rw-r--r--numpy/core/src/multiarray/number.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c
index 9cbb23ed9..168799f11 100644
--- a/numpy/core/src/multiarray/number.c
+++ b/numpy/core/src/multiarray/number.c
@@ -162,7 +162,7 @@ needs_right_binop_forward(PyObject *self, PyObject *other,
#define GIVE_UP_IF_HAS_RIGHT_BINOP(m1, m2, left_name, right_name, inplace, slot_name) \
do { \
if (needs_right_binop_forward((PyObject *)m1, m2, right_name, inplace) && \
- !SAME_SLOTS(m1, m2, slot_name)) { \
+ (inplace || !SAME_SLOTS(m1, m2, slot_name))) { \
Py_INCREF(Py_NotImplemented); \
return Py_NotImplemented; \
} \