diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-05-11 23:17:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-05-11 23:17:34 (GMT) |
| commit | 89aea5075eeeed4df0033cec4caa3f1eba3bf168 (patch) | |
| tree | 71b345a00915bee1b32db74fb111966bdc54a541 /Modules/_operator.c | |
| parent | 234fb2d503cd8f8bae56eb7fa4d0a88cd1b7c03a (diff) | |
| parent | 23a192d9633ace0fe83c9ac392e1df06d8c35da6 (diff) | |
| download | cpython-89aea5075eeeed4df0033cec4caa3f1eba3bf168.zip cpython-89aea5075eeeed4df0033cec4caa3f1eba3bf168.tar.gz cpython-89aea5075eeeed4df0033cec4caa3f1eba3bf168.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Modules/_operator.c')
| -rw-r--r-- | Modules/_operator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_operator.c b/Modules/_operator.c index bcc0a0e..9c5c0d2 100644 --- a/Modules/_operator.c +++ b/Modules/_operator.c @@ -279,7 +279,7 @@ compare_digest(PyObject *self, PyObject *args) 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'", |