From: Christian Heimes <christian@cheimes.de>
Date: Fri, 22 Aug 2008 19:55:54 +0000 (+0000)
Subject: Silenced a compiler warning in the sqlite module
X-Git-Tag: v2.6rc1~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a27a62e74caece828fd34c6247dae8870f52d194;p=thirdparty%2FPython%2Fcpython.git

Silenced a compiler warning in the sqlite module
Modules/_sqlite/row.c:187: warning: suggest parentheses around && within ||
Reviewed by Benjamin Peterson
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0a328bde66c5..e5b37a95b0a2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,8 @@ Core and Builtins
 Library
 -------
 
+- Silenced a trivial compiler warning in the sqlite module.
+
 
 What's New in Python 2.6 beta 3?
 ================================
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index 34192673a63b..f1e1c43c52ce 100644
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -183,8 +183,8 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other,
     if (PyType_IsSubtype(Py_TYPE(_other), &pysqlite_RowType)) {
 	pysqlite_Row *other = (pysqlite_Row *)_other;
 	PyObject *res = PyObject_RichCompare(self->description, other->description, opid);
-	if (opid == Py_EQ && res == Py_True
-	    || opid == Py_NE && res == Py_False) {
+	if ((opid == Py_EQ && res == Py_True)
+	    || (opid == Py_NE && res == Py_False)) {
 	    Py_DECREF(res);
 	    return PyObject_RichCompare(self->data, other->data, opid);
 	}