Mercurial > hg > vampy
diff PyTypeInterface.cpp @ 41:94d09b4027aa
* Merge r1089 from earlier vampy2 branch
| author | cannam |
|---|---|
| date | Mon, 05 Oct 2009 12:51:08 +0000 |
| parents | 27bab3a16c9a |
| children | af9c4cee95a8 |
line wrap: on
line diff
--- a/PyTypeInterface.cpp Mon Oct 05 12:47:58 2009 +0000 +++ b/PyTypeInterface.cpp Mon Oct 05 12:51:08 2009 +0000 @@ -132,7 +132,7 @@ } // convert the first element of any iterable sequence (for convenience and backwards compatibility) - if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) + if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) { PyObject* item = PySequence_GetItem(pyValue,0); if (item) @@ -216,7 +216,7 @@ } // convert the first element of iterable sequences - if (PySequence_Check(pyValue) and PySequence_Size(pyValue) > 0) + if (PySequence_Check(pyValue) && PySequence_Size(pyValue) > 0) { PyObject* item = PySequence_GetItem(pyValue,0); if (item)