summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-02-13 18:34:53 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-02-13 18:34:53 (GMT)
commitedff7af1cf5745ae142a6ad2c25f158ef705aeb0 (patch)
tree934b31561898a94c379b1c28bdf085056e663275 /Modules
parentc2d8689150ae86e07dc001b38e24c737849ca028 (diff)
downloadcpython-edff7af1cf5745ae142a6ad2c25f158ef705aeb0.zip
cpython-edff7af1cf5745ae142a6ad2c25f158ef705aeb0.tar.gz
cpython-edff7af1cf5745ae142a6ad2c25f158ef705aeb0.tar.bz2
Issue #7924: Fix an intermittent 'XXX undetected error' crash in
test_capi, due to test_capsule failing to clear an exception. Many thanks to Florent Xicluna for the diagnosis and fix.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_testcapimodule.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index f9f6fca..5631d5a 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1763,6 +1763,8 @@ test_capsule(PyObject *self, PyObject *args)
Py_DECREF(object);
Py_DECREF(module);
}
+ else
+ PyErr_Clear();
}
exit: