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

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	socketmodule.c 
Log Message:
Put back multi-arg capability on connect/connect_ex/bind, for
backwards compatibility, and to avoid a revolution.


Index: socketmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -r1.99 -r1.100
*** socketmodule.c	2000/03/31 17:24:30	1.99
--- socketmodule.c	2000/04/04 14:10:20	1.100
***************
*** 67,76 ****
  
  Socket methods:
  
  - s.accept() --> new socket object, sockaddr
! - s.bind(sockaddr) --> None
  - s.close() --> None
! - s.connect(sockaddr) --> None
! - s.connect_ex(sockaddr) --> 0 or errno (handy for e.g. async connect)
  - s.fileno() --> file descriptor
  - s.dup() --> same as socket.fromfd(os.dup(s.fileno(), ...)
--- 67,79 ----
  
  Socket methods:
+ (NB: an argument list of the form (sockaddr...) means that multiple
+ arguments are treated the same as a single tuple argument, for backwards
+ compatibility.)
  
  - s.accept() --> new socket object, sockaddr
! - s.bind(sockaddr...) --> None
  - s.close() --> None
! - s.connect(sockaddr...) --> None
! - s.connect_ex(sockaddr...) --> 0 or errno (handy for e.g. async connect)
  - s.fileno() --> file descriptor
  - s.dup() --> same as socket.fromfd(os.dup(s.fileno(), ...)
***************
*** 850,854 ****
  
  
! /* s.bind(sockaddr) method */
  
  static PyObject *
--- 853,857 ----
  
  
! /* s.bind(sockaddr...) method */
  
  static PyObject *
***************
*** 858,865 ****
  	int addrlen;
  	int res;
! 	PyObject *addro;
! 	if (!PyArg_ParseTuple(args, "O:bind", &addro))
! 		return NULL;
! 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 861,865 ----
  	int addrlen;
  	int res;
! 	if (!getsockaddrarg(s, args, &addr, &addrlen))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 904,908 ****
  
  
! /* s.connect(sockaddr) method */
  
  static PyObject *
--- 904,908 ----
  
  
! /* s.connect(sockaddr...) method */
  
  static PyObject *
***************
*** 912,920 ****
  	int addrlen;
  	int res;
! 	PyObject *addro;
! 	if (!PyArg_ParseTuple(args, "O:connect", &addro))
  		return NULL;
- 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
- 		return NULL;
  	Py_BEGIN_ALLOW_THREADS
  	res = connect(s->sock_fd, addr, addrlen);
--- 912,917 ----
  	int addrlen;
  	int res;
! 	if (!getsockaddrarg(s, args, &addr, &addrlen))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
  	res = connect(s->sock_fd, addr, addrlen);
***************
*** 933,937 ****
  
  
! /* s.connect_ex(sockaddr) method */
  
  static PyObject *
--- 930,934 ----
  
  
! /* s.connect_ex(sockaddr...) method */
  
  static PyObject *
***************
*** 941,948 ****
  	int addrlen;
  	int res;
! 	PyObject *addro;
! 	if (!PyArg_ParseTuple(args, "O:connect_ex", &addro))
! 		return NULL;
! 	if (!getsockaddrarg(s, addro, &addr, &addrlen))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 938,942 ----
  	int addrlen;
  	int res;
! 	if (!getsockaddrarg(s, args, &addr, &addrlen))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1311,1321 ****
  	{"accept",		(PyCFunction)PySocketSock_accept, 1,
  				accept_doc},
! 	{"bind",		(PyCFunction)PySocketSock_bind, 1,
  				bind_doc},
  	{"close",		(PyCFunction)PySocketSock_close, 1,
  				close_doc},
! 	{"connect",		(PyCFunction)PySocketSock_connect, 1,
  				connect_doc},
! 	{"connect_ex",		(PyCFunction)PySocketSock_connect_ex, 1,
  				connect_ex_doc},
  #ifndef NO_DUP
--- 1305,1315 ----
  	{"accept",		(PyCFunction)PySocketSock_accept, 1,
  				accept_doc},
! 	{"bind",		(PyCFunction)PySocketSock_bind, 0,
  				bind_doc},
  	{"close",		(PyCFunction)PySocketSock_close, 1,
  				close_doc},
! 	{"connect",		(PyCFunction)PySocketSock_connect, 0,
  				connect_doc},
! 	{"connect_ex",		(PyCFunction)PySocketSock_connect_ex, 0,
  				connect_ex_doc},
  #ifndef NO_DUP