merge 3.2

pjenvey · pjenvey · commit 000bd4254fa2 · 2012-11-13T12:27:56.000-08:00
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
@@ -551,6 +551,7 @@ def inner_raising_func():
             e.__context__ = None
             obj = None
             obj = wr()
+            gc_collect()
             self.assertTrue(obj is None, "%s" % obj)
 
         # Some complicated construct
@@ -567,6 +568,7 @@ def inner_raising_func():
             except MyException:
                 pass
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
@@ -581,6 +583,7 @@ def __exit__ (self, exc_type, exc_value, exc_tb):
         with Context():
             inner_raising_func()
         obj = None
+        gc_collect()
         obj = wr()
         self.assertTrue(obj is None, "%s" % obj)
 
