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
........
This commit is contained in:
Christian Heimes 2008-08-22 19:56:47 +00:00
parent 6144bee228
commit e9cf5e3495
1 changed files with 2 additions and 2 deletions

View File

@ -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);
}