summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-01-18 05:43:21 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2012-01-18 05:43:21 +0200
commite81ac8b56b8046801c79d23ff3f18dc0bcfb827c (patch)
tree8e872809074a36822c509082135ea5d704ddddbf
parent226231c93047a4483adc0001b10fb714341113d4 (diff)
parentacd5f7bcebe9a341cf5d98425f228695dffab8e0 (diff)
downloadcpython-git-e81ac8b56b8046801c79d23ff3f18dc0bcfb827c.tar.gz
#13665: merge with 3.2.
-rw-r--r--Modules/_ctypes/cfield.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index 73ac519ae7..1c4eba90ec 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -1365,7 +1365,7 @@ z_set(void *ptr, PyObject *value, Py_ssize_t size)
_RET(value);
}
PyErr_Format(PyExc_TypeError,
- "string or integer address expected instead of %s instance",
+ "bytes or integer address expected instead of %s instance",
value->ob_type->tp_name);
return NULL;
}