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

Patch by Michael Hudson to clarify the error message from

Browse source 
getsockaddrarg when the address is not a tuple.
This commit is contained in:
Guido van Rossum 2000-12-01 13:13:11 +00:00
parent 60a1e7fc99
commit e4dad905d4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/socketmodule.c
View file

@ -605,7 +605,13 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, struct sockaddr **addr_ret
char *host; char *host;
int port; int port;
addr=(struct sockaddr_in*)&(s->sock_addr).in; addr=(struct sockaddr_in*)&(s->sock_addr).in;
if (!PyArg_Parse(args, "(si)", &host, &port)) if (!PyTuple_Check(args)) {
PyErr_Format(PyExc_TypeError,
"getsockaddrarg: AF_INET address must be tuple, not %.500s",
args->ob_type->tp_name);
return 0;
}
if (!PyArg_ParseTuple(args, "si:getsockaddrarg", &host, &port))
return 0; return 0;
if (setipaddr(host, addr) < 0) if (setipaddr(host, addr) < 0)
return 0; return 0;