mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #22161: Conformed arguments type checks in ctype to actually supported

Browse source 
types.  Corrected error messages about bytes arguments.
This commit is contained in:
Serhiy Storchaka 2014-08-09 09:33:05 +03:00
parent e4936b830c
commit 4f06d604c4
6 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Modules/_ctypes/_ctypes.c
View file

@ -1080,7 +1080,7 @@ CharArray_set_raw(CDataObject *self, PyObject *value)
ptr = view.buf;
if (size > self->b_size) {
PyErr_SetString(PyExc_ValueError,
"string too long");
"byte string too long");
goto fail;
}
@ -1132,7 +1132,7 @@ CharArray_set_value(CDataObject *self, PyObject *value)
size = PyBytes_GET_SIZE(value);
if (size > self->b_size) {
PyErr_SetString(PyExc_ValueError,
"string too long");
"byte string too long");
Py_DECREF(value);
return -1;
}
@ -1471,7 +1471,7 @@ c_wchar_p_from_param(PyObject *type, PyObject *value)
Py_INCREF(Py_None);
return Py_None;
}
if (PyUnicode_Check(value) || PyBytes_Check(value)) {
if (PyUnicode_Check(value)) {
PyCArgObject *parg;
struct fielddesc *fd = _ctypes_get_fielddesc("Z");
@ -1623,25 +1623,8 @@ c_void_p_from_param(PyObject *type, PyObject *value)
return (PyObject *)parg;
}
/* XXX struni: remove later */
/* string */
if (PyBytes_Check(value)) {
PyCArgObject *parg;
struct fielddesc *fd = _ctypes_get_fielddesc("z");
parg = PyCArgObject_new();
if (parg == NULL)
return NULL;
parg->pffi_type = &ffi_type_pointer;
parg->tag = 'z';
parg->obj = fd->setfunc(&parg->value, value, 0);
if (parg->obj == NULL) {
Py_DECREF(parg);
return NULL;
}
return (PyObject *)parg;
}
/* bytes */
if (PyByteArray_Check(value)) {
if (PyBytes_Check(value)) {
PyCArgObject *parg;
struct fielddesc *fd = _ctypes_get_fielddesc("z");
@ -3218,7 +3201,7 @@ _get_name(PyObject *obj, char **pname)
return *pname ? 1 : 0;
}
PyErr_SetString(PyExc_TypeError,
"function name must be string or integer");
"function name must be string, bytes object or integer");
return 0;
}

6
Modules/_ctypes/cfield.c
View file

@ -1160,7 +1160,7 @@ c_set(void *ptr, PyObject *value, Py_ssize_t size)
}
error:
PyErr_Format(PyExc_TypeError,
"one character string expected");
"one character bytes, bytearray or integer expected");
return NULL;
}
@ -1295,7 +1295,7 @@ s_set(void *ptr, PyObject *value, Py_ssize_t length)
Py_INCREF(value);
} else {
PyErr_Format(PyExc_TypeError,
"expected string, %s found",
"expected bytes, %s found",
value->ob_type->tp_name);
return NULL;
}
@ -1311,7 +1311,7 @@ s_set(void *ptr, PyObject *value, Py_ssize_t length)
++size;
} else if (size > length) {
PyErr_Format(PyExc_ValueError,
"string too long (%zd, maximum length %zd)",
"bytes too long (%zd, maximum length %zd)",
size, length);
Py_DECREF(value);
return NULL;