Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #5421: merge fix

This commit is contained in:
Antoine Pitrou 2011-03-17 22:46:17 +01:00
parent 8e74967855 9befeb3743
commit fee6684f3c
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -72,6 +72,9 @@ Core and Builtins
Library Library
------- -------
- Issue #5421: Fix misleading error message when one of socket.sendto()'s
arguments has the wrong type. Patch by Nikita Vetoshkin.
- Issue #10812: Add some extra posix functions to the os module. - Issue #10812: Add some extra posix functions to the os module.
- Issue #10979: unittest stdout buffering now works with class and module - Issue #10979: unittest stdout buffering now works with class and module

23
Modules/socketmodule.c
View File

@ -2747,17 +2747,28 @@ sock_sendto(PySocketSockObject *s, PyObject *args)
Py_buffer pbuf; Py_buffer pbuf;
PyObject *addro; PyObject *addro;
char *buf; char *buf;
Py_ssize_t len; Py_ssize_t len, arglen;
sock_addr_t addrbuf; sock_addr_t addrbuf;
int addrlen, n = -1, flags, timeout; int addrlen, n = -1, flags, timeout;
flags = 0; flags = 0;
if (!PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro)) { arglen = PyTuple_Size(args);
PyErr_Clear(); switch (arglen) {
if (!PyArg_ParseTuple(args, "y*iO:sendto", case 2:
&pbuf, &flags, &addro)) PyArg_ParseTuple(args, "y*O:sendto", &pbuf, &addro);
return NULL; 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; buf = pbuf.buf;
len = pbuf.len; len = pbuf.len;