[Python-checkins] r78173 - python/branches/py3k/Modules/_testcapimodule.c

[mark.dickinson]

Author: mark.dickinson
Date: Sat Feb 13 19:37:34 2010
New Revision: 78173

Log:
Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.

Modified:
   python/branches/py3k/Modules/_testcapimodule.c

Modified: python/branches/py3k/Modules/_testcapimodule.c
==============================================================================
--- python/branches/py3k/Modules/_testcapimodule.c	(original)
+++ python/branches/py3k/Modules/_testcapimodule.c	Sat Feb 13 19:37:34 2010
@@ -1771,21 +1771,6 @@
 	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
 }