[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.66,2.67 unicodeobject.c,2.23,2.24

A.M. Kuchling python-dev@python.org
Fri, 9 Jun 2000 07:04:55 -0700


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

Modified Files:
	stringobject.c unicodeobject.c 
Log Message:
Patch from Michael Hudson: improve unclear error message


Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.66
retrieving revision 2.67
diff -C2 -r2.66 -r2.67
*** stringobject.c	2000/06/01 03:12:13	2.66
--- stringobject.c	2000/06/09 14:04:53	2.67
***************
*** 394,398 ****
  	if (!PyString_Check(el) || PyString_Size(el) != 1) {
  		PyErr_SetString(PyExc_TypeError,
! 				"string member test needs char left operand");
  		return -1;
  	}
--- 394,398 ----
  	if (!PyString_Check(el) || PyString_Size(el) != 1) {
  		PyErr_SetString(PyExc_TypeError,
! 		    "'in <string>' requires character as left operand");
  		return -1;
  	}

Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.23
retrieving revision 2.24
diff -C2 -r2.23 -r2.24
*** unicodeobject.c	2000/06/08 17:54:00	2.23
--- unicodeobject.c	2000/06/09 14:04:53	2.24
***************
*** 2997,3001 ****
      if (PyUnicode_GET_SIZE(v) != 1) {
  	PyErr_SetString(PyExc_TypeError,
! 			"string member test needs char left operand");
  	goto onError;
      }
--- 2997,3001 ----
      if (PyUnicode_GET_SIZE(v) != 1) {
  	PyErr_SetString(PyExc_TypeError,
! 	    "'in <string>' requires character as left operand");
  	goto onError;
      }