mirror of https://github.com/python/cpython
Issue #5421: merge fix
This commit is contained in:
commit
9befeb3743
|
@ -40,6 +40,8 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #5421: Fix misleading error message when one of socket.sendto()'s
|
||||
arguments has the wrong type. Patch by Nikita Vetoshkin.
|
||||
|
||||
- Issue #10979: unittest stdout buffering now works with class and module
|
||||
setup and teardown.
|
||||
|
|
|
@ -2747,17 +2747,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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue