summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-08-31 05:15:44 (GMT)
committerFred Drake <fdrake@acm.org>2000-08-31 05:15:44 (GMT)
commit562f62aa9b87121ba6086c4dee74130f003c9422 (patch)
treefc6571a76827ac31d9201fa917b99c0d2027f205
parentdd19eaf966662ecacdf9d7d8c31e07a4d634d228 (diff)
downloadcpython-562f62aa9b87121ba6086c4dee74130f003c9422.zip
cpython-562f62aa9b87121ba6086c4dee74130f003c9422.tar.gz
cpython-562f62aa9b87121ba6086c4dee74130f003c9422.tar.bz2
Removed compiler warning about wanting explicit grouping around &&
expression next to a || expression; this is a readability-inspired warning from GCC.
-rw-r--r--Objects/abstract.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 0304915..e3492ec 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -812,10 +812,12 @@ PyNumber_InPlaceAdd(PyObject *v, PyObject *w)
if (PyInstance_HalfBinOp(v, w, "__iadd__", &x,
PyNumber_Add, 0) <= 0)
return x;
- } else if (HASINPLACE(v) && (v->ob_type->tp_as_sequence != NULL &&
- (f = v->ob_type->tp_as_sequence->sq_inplace_concat) != NULL) ||
- (v->ob_type->tp_as_number != NULL &&
- (f = v->ob_type->tp_as_number->nb_inplace_add) != NULL))
+ }
+ else if ((HASINPLACE(v)
+ && (v->ob_type->tp_as_sequence != NULL &&
+ (f = v->ob_type->tp_as_sequence->sq_inplace_concat) != NULL))
+ || (v->ob_type->tp_as_number != NULL &&
+ (f = v->ob_type->tp_as_number->nb_inplace_add) != NULL))
return (*f)(v, w);
BINOP(v, w, "__add__", "__radd__", PyNumber_Add);