[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.58,2.59

[Guido van Rossum]

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/home/guido/hp/mal/py-patched/Objects

Modified Files:
	stringobject.c 
Log Message:
Fix typo in replace() detected by Mark Hammond and fixed by Marc-Andre.


Index: stringobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.58
retrieving revision 2.59
diff -C2 -r2.58 -r2.59
*** stringobject.c	2000/03/10 22:55:18	2.58
--- stringobject.c	2000/03/13 15:56:08	2.59
***************
*** 390,394 ****
  	register char *s, *end;
  	register char c;
! 	if (!PyString_Check(el) || PyString_Size(el) != 1) {
  		PyErr_SetString(PyExc_TypeError,
  				"string member test needs char left operand");
--- 390,396 ----
  	register char *s, *end;
  	register char c;
! 	if (!PyString_Check(el))
! 		return PyUnicode_Contains(a, el);
! 	if (PyString_Size(el) != 1) {
  		PyErr_SetString(PyExc_TypeError,
  				"string member test needs char left operand");
***************
*** 1576,1580 ****
  		return NULL;
  
! 	if (repl_len <= 0) {
  		PyErr_SetString(PyExc_ValueError, "empty replacement string");
  		return NULL;
--- 1578,1582 ----
  		return NULL;
  
! 	if (sub_len <= 0) {
  		PyErr_SetString(PyExc_ValueError, "empty replacement string");
  		return NULL;