[Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.185,2.186

A.M. Kuchling python-dev@python.org
Sat, 23 Dec 2000 06:11:30 -0800


Update of /cvsroot/python/python/dist/src/Python
In directory usw-pr-cvs1:/tmp/cvs-serv16346

Modified Files:
	bltinmodule.c 
Log Message:
CHange error messages for ord(), using "string" instead of "string or Unicode"


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.185
retrieving revision 2.186
diff -C2 -r2.185 -r2.186
*** bltinmodule.c	2000/12/20 15:07:34	2.185
--- bltinmodule.c	2000/12/23 14:11:28	2.186
***************
*** 1525,1529 ****
  	} else {
  		PyErr_Format(PyExc_TypeError,
! 			     "ord() expected string or Unicode character, " \
  			     "%.200s found", obj->ob_type->tp_name);
  		return NULL;
--- 1525,1529 ----
  	} else {
  		PyErr_Format(PyExc_TypeError,
! 			     "ord() expected string of length 1, but " \
  			     "%.200s found", obj->ob_type->tp_name);
  		return NULL;
***************
*** 1531,1535 ****
  
  	PyErr_Format(PyExc_TypeError, 
! 		     "ord() expected a character, length-%d string found",
  		     size);
  	return NULL;
--- 1531,1536 ----
  
  	PyErr_Format(PyExc_TypeError, 
! 		     "ord() expected a character, "
! 		     "but string of length %d found",
  		     size);
  	return NULL;