[Python-3000-checkins] r65979 - in python/branches/py3k: Modules/_sqlite/row.c

christian.heimes python-3000-checkins at python.org
Fri Aug 22 21:56:47 CEST 2008


Author: christian.heimes
Date: Fri Aug 22 21:56:47 2008
New Revision: 65979

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_sqlite/row.c

Modified: python/branches/py3k/Modules/_sqlite/row.c
==============================================================================
--- python/branches/py3k/Modules/_sqlite/row.c	(original)
+++ python/branches/py3k/Modules/_sqlite/row.c	Fri Aug 22 21:56:47 2008
@@ -178,8 +178,8 @@
     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);
 	}


More information about the Python-3000-checkins mailing list