From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 23 Feb 2003 21:45:43 +0000 (+0000)
Subject: Fix SF bug #690435, apply fails to check if warning raises exception
X-Git-Tag: v2.3c1~1720
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e59076b1d7313b564786ffcbec17ee86aa5cc60;p=python

Fix SF bug #690435, apply fails to check if warning raises exception
(patch provided by Greg Chapman)
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 62aa5121f5..e2465916ee 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -75,9 +75,10 @@ builtin_apply(PyObject *self, PyObject *args)
 	PyObject *func, *alist = NULL, *kwdict = NULL;
 	PyObject *t = NULL, *retval = NULL;
 
-	PyErr_Warn(PyExc_PendingDeprecationWarning,
-		   "use func(*args, **kwargs) instead of "
-		   "apply(func, args, kwargs)");
+	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;
 	if (alist != NULL) {