[Python-checkins] cpython (2.7): use logical rather than bit and

[benjamin.peterson]

http://hg.python.org/cpython/rev/9f03b1149f78
changeset:   90648:9f03b1149f78
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 11 16:17:02 2014 -0700
summary:
  use logical rather than bit and

files:
  Modules/operator.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/operator.c b/Modules/operator.c
--- a/Modules/operator.c
+++ b/Modules/operator.c
@@ -319,7 +319,7 @@
         Py_buffer view_a;
         Py_buffer view_b;
 
-        if ((PyObject_CheckBuffer(a) == 0) & (PyObject_CheckBuffer(b) == 0)) {
+        if (PyObject_CheckBuffer(a) == 0 && PyObject_CheckBuffer(b) == 0) {
             PyErr_Format(PyExc_TypeError,
                          "unsupported operand types(s) or combination of types: "
                          "'%.100s' and '%.100s'",

-- 
Repository URL: http://hg.python.org/cpython