Mercurial > cpython-lru_cache-weakref
comparison Python/bltinmodule.c @ 28027:43a9ecbd9607 legacy-trunk
Fix SF bug #690435, apply fails to check if warning raises exception
(patch provided by Greg Chapman)
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Sun, 23 Feb 2003 21:45:43 +0000 |
| parents | be7683a6f521 |
| children | d56282c28a1e |
comparison
equal
deleted
inserted
replaced
| 28026:906459614b5e | 28027:43a9ecbd9607 |
|---|---|
| 73 builtin_apply(PyObject *self, PyObject *args) | 73 builtin_apply(PyObject *self, PyObject *args) |
| 74 { | 74 { |
| 75 PyObject *func, *alist = NULL, *kwdict = NULL; | 75 PyObject *func, *alist = NULL, *kwdict = NULL; |
| 76 PyObject *t = NULL, *retval = NULL; | 76 PyObject *t = NULL, *retval = NULL; |
| 77 | 77 |
| 78 PyErr_Warn(PyExc_PendingDeprecationWarning, | 78 if (PyErr_Warn(PyExc_PendingDeprecationWarning, |
| 79 "use func(*args, **kwargs) instead of " | 79 "use func(*args, **kwargs) instead of " |
| 80 "apply(func, args, kwargs)"); | 80 "apply(func, args, kwargs)") < 0) |
| 81 return NULL; | |
| 81 if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict)) | 82 if (!PyArg_UnpackTuple(args, "apply", 1, 3, &func, &alist, &kwdict)) |
| 82 return NULL; | 83 return NULL; |
| 83 if (alist != NULL) { | 84 if (alist != NULL) { |
| 84 if (!PyTuple_Check(alist)) { | 85 if (!PyTuple_Check(alist)) { |
| 85 if (!PySequence_Check(alist)) { | 86 if (!PySequence_Check(alist)) { |
