mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2014-05-11 16:17:34 -07:00
commit 89aea5075e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/_operator.c
View file

@ -279,7 +279,7 @@ compare_digest(PyObject *self, PyObject *args)
Py_buffer view_a; Py_buffer view_a;
Py_buffer view_b; 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, PyErr_Format(PyExc_TypeError,
"unsupported operand types(s) or combination of types: " "unsupported operand types(s) or combination of types: "
"'%.100s' and '%.100s'", "'%.100s' and '%.100s'",