diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-02-13 18:34:53 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-02-13 18:34:53 (GMT) |
| commit | edff7af1cf5745ae142a6ad2c25f158ef705aeb0 (patch) | |
| tree | 934b31561898a94c379b1c28bdf085056e663275 | |
| parent | c2d8689150ae86e07dc001b38e24c737849ca028 (diff) | |
| download | cpython-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.
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 2 |
2 files changed, 6 insertions, 0 deletions
@@ -738,6 +738,10 @@ Documentation Tests ----- +- Issue #7924: Fix an intermittent 'XXX undetected error' failure in + test_capi (only seen so far on platforms where the curses module + wasn't built), due to an uncleared exception. + - issue #7728: test_timeout was changed to use test_support.bind_port instead of a hard coded port. 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: |