#13665: merge with 3.2.

ezio-melotti · ezio-melotti · commit e81ac8b56b80 · 2012-01-18T05:43:21.000+02:00
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,7 @@ z_set(void ptr, PyObject value, Py_ssize_t size)`
`1365`	`1365`	`_RET(value);`
`1366`	`1366`	`}`
`1367`	`1367`	`PyErr_Format(PyExc_TypeError,`
`1368`		`- "string or integer address expected instead of %s instance",`
	`1368`	`+ "bytes or integer address expected instead of %s instance",`
`1369`	`1369`	`value->ob_type->tp_name);`
`1370`	`1370`	`return NULL;`
`1371`	`1371`	`}`