Merged revisions 65978 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65978 | christian.heimes | 2008-08-22 21:55:54 +0200 (Fri, 22 Aug 2008) | 3 lines

  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/Modules/_sqlite/row.c b/Modules/_sqlite/row.c
index 8778af0a96ddc8134e78c697f7d33190be0490b5..d357efac84256803a851f25f1502735ff5bb40da 100644 (file)
--- a/Modules/_sqlite/row.c
+++ b/Modules/_sqlite/row.c
@@ -178,8 +178,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);
        }