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.

diff --git a/Misc/NEWS b/Misc/NEWS
index 762def27c58e78d1fa53c2e4d6ab099e63ef7145..f911bd4fc0c78ae9269c55df6c16059872f71e5c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 f9f6fca8733194fc44f56532f5c7a7107af6e876..5631d5a037ea29098237e1152927998bc5f0fe1a 100644 (file)
--- 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: