summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-02-13 18:37:34 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-02-13 18:37:34 (GMT)
commitbb13fbf92a5b087805da723449596574b978cd9f (patch)
tree26b5af4e5a705c6b335cc53200a03939cc7869d8 /Modules
parentedff7af1cf5745ae142a6ad2c25f158ef705aeb0 (diff)
downloadcpython-bb13fbf92a5b087805da723449596574b978cd9f.zip
cpython-bb13fbf92a5b087805da723449596574b978cd9f.tar.gz
cpython-bb13fbf92a5b087805da723449596574b978cd9f.tar.bz2
Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_testcapimodule.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 5631d5a..3824388 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -1771,21 +1771,6 @@ test_capsule(PyObject *self, PyObject *args)
if (error) {
return raiseTestError("test_capsule", error);
}
- /* 13/12/2009: something is causing test_capi to fail occasionally on
- the Solaris buildbot, with the output:
-
- internal test_L_code
- internal test_Z_code
- internal test_bug_7414
- internal test_capsule
- XXX undetected error
- internaltest test_capi crashed -- <class 'ImportError'>: No module named datetime
-
- It seems possible that test_capsule is raising an exception but
- failing to return NULL. Do a PyErr_Occurred check to find out.
- */
- if (PyErr_Occurred())
- return NULL;
Py_RETURN_NONE;
#undef FAIL
}