[Python-checkins] python/dist/src/Python bltinmodule.c,2.281,2.282

[nnorwitz@users.sourceforge.net]

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

Modified Files:
	bltinmodule.c 
Log Message:
Fix SF bug #690435, apply fails to check if warning raises exception
(patch provided by Greg Chapman)


Index: bltinmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.281
retrieving revision 2.282
diff -C2 -d -r2.281 -r2.282
*** bltinmodule.c	13 Feb 2003 22:07:58 -0000	2.281
--- bltinmodule.c	23 Feb 2003 21:45:43 -0000	2.282
***************
*** 76,82 ****
  	PyObject *t = NULL, *retval = NULL;
  
! 	PyErr_Warn(PyExc_PendingDeprecationWarning,
! 		   "use func(*args, **kwargs) instead of "
! 		   "apply(func, args, kwargs)");
  	if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
  		return NULL;
--- 76,83 ----
  	PyObject *t = NULL, *retval = NULL;
  
! 	if (PyErr_Warn(PyExc_PendingDeprecationWarning,
! 		       "use func(*args, **kwargs) instead of "
! 		       "apply(func, args, kwargs)") < 0)
! 		return NULL;
  	if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict))
  		return NULL;