mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #5421: Fix misleading error message when one of socket.sendto()'s

Browse source 
arguments has the wrong type.  Patch by Nikita Vetoshkin.
This commit is contained in:
Antoine Pitrou 2011-03-17 22:38:37 +01:00
parent 9f9193ec37
commit 5e98141f9f
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Modules/socketmodule.c
View file

@ -2647,17 +2647,28 @@ sock_sendto(PySocketSockObject *s, PyObject *args)
Py_buffer pbuf;
PyObject *addro;
char *buf;
Py_ssize_t len;
Py_ssize_t len, arglen;
sock_addr_t addrbuf;
int addrlen, n = -1, flags, timeout;
flags = 0;
if (!PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro)) {
PyErr_Clear();
if (!PyArg_ParseTuple(args, "y*iO:sendto",
&pbuf, &flags, &addro))
return NULL;
arglen = PyTuple_Size(args);
switch (arglen) {
case 2:
PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro);
break;
case 3:
PyArg_ParseTuple(args, "y*iO:sendto",
&pbuf, &flags, &addro);
break;
default:
PyErr_Format(PyExc_TypeError,
"sendto() takes 2 or 3 arguments (%d given)",
arglen);
}
if (PyErr_Occurred())
return NULL;
buf = pbuf.buf;
len = pbuf.len;