[Python-checkins] CVS: python/dist/src/Modules readline.c,2.35.4.1,2.35.4.2 socketmodule.c,1.141.4.3,1.141.4.4

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv23606/descr/dist/src/Modules

Modified Files:
      Tag: descr-branch
	readline.c socketmodule.c 
Log Message:
Mrege of trunk tag delta date2001-07-30 to date2001-08-01.


Index: readline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v
retrieving revision 2.35.4.1
retrieving revision 2.35.4.2
diff -C2 -d -r2.35.4.1 -r2.35.4.2
*** readline.c	2001/07/14 07:47:35	2.35.4.1
--- readline.c	2001/08/02 02:40:43	2.35.4.2
***************
*** 267,271 ****
  Set or remove the completer function.\n\
  The function is called as function(text, state),\n\
! for i in [0, 1, 2, ...] until it returns a non-string.\n\
  It should return the next possible completion starting with 'text'.\
  ";
--- 267,271 ----
  Set or remove the completer function.\n\
  The function is called as function(text, state),\n\
! for state in 0, 1, 2, ..., until it returns a non-string.\n\
  It should return the next possible completion starting with 'text'.\
  ";

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.141.4.3
retrieving revision 1.141.4.4
diff -C2 -d -r1.141.4.3 -r1.141.4.4
*** socketmodule.c	2001/07/28 05:02:59	1.141.4.3
--- socketmodule.c	2001/08/02 02:40:43	1.141.4.4
***************
*** 220,227 ****
  
  /* I know this is a bad practice, but it is the easiest... */
! #ifndef HAVE_GETADDRINFO
  #include "getaddrinfo.c"
  #endif
! #ifndef HAVE_GETNAMEINFO
  #include "getnameinfo.c"
  #endif
--- 220,231 ----
  
  /* I know this is a bad practice, but it is the easiest... */
! /* XXX Temporarily work around bug #445928:
!    getaddrinfo on Darwin seems to return an empty result list, with
!    no error, even if host lookup ought to work fine. So use the
!    emulation code for now. */
! #if !defined(HAVE_GETADDRINFO) || defined(__APPLE__)
  #include "getaddrinfo.c"
  #endif
! #if !defined(HAVE_GETNAMEINFO) || defined(__APPLE__)
  #include "getnameinfo.c"
  #endif
***************
*** 2346,2354 ****
  	}
  	if (PyInt_Check(pobj)) {
! #ifndef HAVE_SNPRINTF
! 		sprintf(pbuf, "%ld", PyInt_AsLong(pobj));
! #else
! 		snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
! #endif
  		pptr = pbuf;
  	} else if (PyString_Check(pobj)) {
--- 2350,2354 ----
  	}
  	if (PyInt_Check(pobj)) {
! 		PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
  		pptr = pbuf;
  	} else if (PyString_Check(pobj)) {
***************
*** 2421,2429 ****
  	if (n == 0)
  		goto fail;
! #ifdef HAVE_SNPRINTF
! 	snprintf(pbuf, sizeof(pbuf), "%d", port);
! #else
! 	sprintf(pbuf, "%d", port);
! #endif
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_UNSPEC;
--- 2421,2425 ----
  	if (n == 0)
  		goto fail;
! 	PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
  	memset(&hints, 0, sizeof(hints));
  	hints.ai_family = PF_UNSPEC;