summaryrefslogtreecommitdiffstats
path: root/Objects/abstract.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-05-31 00:25:43 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-05-31 00:25:43 (GMT)
commitcccfd9932dcbf808ca3b3e2c494799dfab4ae074 (patch)
tree287d56155899a1cd0b7f68eb581e792ee3e4b792 /Objects/abstract.c
parent15ac3110883c7f6e5cde5dd308baf178e666b985 (diff)
parent1eb6d278a8139dda25efbe1b3509aac159bc54fd (diff)
downloadcpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.zip
cpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.tar.gz
cpython-cccfd9932dcbf808ca3b3e2c494799dfab4ae074.tar.bz2
merge heads
Diffstat (limited to 'Objects/abstract.c')
-rw-r--r--Objects/abstract.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 11e145f..f992573 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -237,7 +237,8 @@ PyObject_AsCharBuffer(PyObject *obj,
pb = obj->ob_type->tp_as_buffer;
if (pb == NULL || pb->bf_getbuffer == NULL) {
PyErr_SetString(PyExc_TypeError,
- "expected an object with the buffer interface");
+ "expected bytes, bytearray "
+ "or buffer compatible object");
return -1;
}
if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE)) return -1;