diff options
author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-09 21:49:43 (GMT) |
---|---|---|
committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-09 21:49:43 (GMT) |
commit | 1aed624f7c6051bc670a846825bd40108d3f8dd5 (patch) | |
tree | bfb494b5e311d0af801388ba4df04b0e716187c1 /Objects/bytesobject.c | |
parent | 81673b7b63973bfe386ce6966a69d40cf9c277bc (diff) | |
download | cpython-1aed624f7c6051bc670a846825bd40108d3f8dd5.zip cpython-1aed624f7c6051bc670a846825bd40108d3f8dd5.tar.gz cpython-1aed624f7c6051bc670a846825bd40108d3f8dd5.tar.bz2 |
Backport fast alternate io.BytesIO implementation.
Merged r62778, r62779, r62802, r62806, r62807, r62808, r62809, r62844,
r62846, r62952, r62956.
Diffstat (limited to 'Objects/bytesobject.c')
-rw-r--r-- | Objects/bytesobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 542f266..3b52147 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -315,8 +315,8 @@ bytes_iconcat(PyBytesObject *self, PyObject *other) Py_buffer vo; if (_getbuffer(other, &vo) < 0) { - PyErr_Format(PyExc_TypeError, "can't concat bytes to %.100s", - Py_TYPE(self)->tp_name); + PyErr_Format(PyExc_TypeError, "can't concat %.100s to %.100s", + Py_TYPE(other)->tp_name, Py_TYPE(self)->tp_name); return NULL; } |