merge 3.2

benjaminp · benjaminp · commit ce2af335622a · 2011-12-10T12:44:37.000-05:00
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -13,11 +13,7 @@
 import warnings
 import select
 import shutil
-try:
-    import gc
-except ImportError:
-    gc = None
-
+import gc
 
 try:
     import resource
@@ -951,7 +947,6 @@ def raise_it():
             self.fail("Exception raised by preexec_fn did not make it "
                       "to the parent process.")
 
-    @unittest.skipUnless(gc, "Requires a gc module.")
     def test_preexec_gc_module_failure(self):
         # This tests the code that disables garbage collection if the child
         # process will execute any Python.
