[Python-checkins] python/dist/src/Python bltinmodule.c,2.291,2.292

[aleax@users.sourceforge.net]

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

Modified Files:
	bltinmodule.c 
Log Message:
some more error-message enhancements


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.291
retrieving revision 2.292
diff -C2 -d -r2.291 -r2.292
*** bltinmodule.c	23 Apr 2003 13:00:44 -0000	2.291
--- bltinmodule.c	23 Apr 2003 13:34:35 -0000	2.292
***************
*** 86,90 ****
  			if (!PySequence_Check(alist)) {
  				PyErr_Format(PyExc_TypeError,
! 				     "apply() arg 2 expect sequence, found %s",
  					     alist->ob_type->tp_name);
  				return NULL;
--- 86,90 ----
  			if (!PySequence_Check(alist)) {
  				PyErr_Format(PyExc_TypeError,
! 				     "apply() arg 2 expected sequence, found %s",
  					     alist->ob_type->tp_name);
  				return NULL;
***************
*** 369,373 ****
  	if ((size_t)length != strlen(str)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"expected string without null bytes");
  		return NULL;
  	}
--- 369,373 ----
  	if ((size_t)length != strlen(str)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"compile() expected string without null bytes");
  		return NULL;
  	}
***************
*** 645,649 ****
  	if (!PyString_Check(name)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"attribute name must be string");
  		return NULL;
  	}
--- 645,649 ----
  	if (!PyString_Check(name)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"getattr(): attribute name must be string");
  		return NULL;
  	}
***************
*** 701,705 ****
  	if (!PyString_Check(name)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"attribute name must be string");
  		return NULL;
  	}
--- 701,705 ----
  	if (!PyString_Check(name)) {
  		PyErr_SetString(PyExc_TypeError,
! 				"hasattr(): attribute name must be string");
  		return NULL;
  	}
***************
*** 1557,1565 ****
  
  	if (fin == NULL) {
! 		PyErr_SetString(PyExc_RuntimeError, "lost sys.stdin");
  		return NULL;
  	}
  	if (fout == NULL) {
! 		PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
  		return NULL;
  	}
--- 1557,1565 ----
  
  	if (fin == NULL) {
! 		PyErr_SetString(PyExc_RuntimeError, "[raw_]input: lost sys.stdin");
  		return NULL;
  	}
  	if (fout == NULL) {
! 		PyErr_SetString(PyExc_RuntimeError, "[raw_]input: lost sys.stdout");
  		return NULL;
  	}
***************
*** 1602,1606 ****
  			if (len > INT_MAX) {
  				PyErr_SetString(PyExc_OverflowError,
! 						"input too long");
  				result = NULL;
  			}
--- 1602,1606 ----
  			if (len > INT_MAX) {
  				PyErr_SetString(PyExc_OverflowError,
! 						"[raw_]input: input too long");
  				result = NULL;
  			}
***************
*** 1777,1781 ****
  			if (!PyErr_Occurred())
  				PyErr_SetString(PyExc_SystemError,
! 						"no locals!?");
  		}
  		else
--- 1777,1781 ----
  			if (!PyErr_Occurred())
  				PyErr_SetString(PyExc_SystemError,
! 						"vars(): no locals!?");
  		}
  		else
***************
*** 1824,1828 ****
  		if (PyObject_TypeCheck(result, &PyBaseString_Type)) {
  			PyErr_SetString(PyExc_TypeError,
! 				"can't sum strings [use ''.join(seq) instead]");
  			Py_DECREF(iter);
  			return NULL;
--- 1824,1828 ----
  		if (PyObject_TypeCheck(result, &PyBaseString_Type)) {
  			PyErr_SetString(PyExc_TypeError,
! 				"sum() can't sum strings [use ''.join(seq) instead]");
  			Py_DECREF(iter);
  			return NULL;
***************
*** 2178,2182 ****
  			item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i);
  		} else {
! 			PyErr_SetString(PyExc_TypeError, "unsubscriptable object");
  			goto Fail_1;
  		}
--- 2178,2182 ----
  			item = tuple->ob_type->tp_as_sequence->sq_item(tuple, i);
  		} else {
! 			PyErr_SetString(PyExc_TypeError, "filter(): unsubscriptable tuple");
  			goto Fail_1;
  		}