[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.128,1.129

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14356

Modified Files:
	socketmodule.c 
Log Message:
Patch by Michael Hudson to clarify the error message from
getsockaddrarg when the address is not a tuple.


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -r1.128 -r1.129
*** socketmodule.c	2000/10/06 15:37:06	1.128
--- socketmodule.c	2000/12/01 13:13:11	1.129
***************
*** 606,610 ****
  		int port;
   		addr=(struct sockaddr_in*)&(s->sock_addr).in;
! 		if (!PyArg_Parse(args, "(si)", &host, &port))
  			return 0;
  		if (setipaddr(host, addr) < 0)
--- 606,616 ----
  		int port;
   		addr=(struct sockaddr_in*)&(s->sock_addr).in;
! 		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;
  		if (setipaddr(host, addr) < 0)