[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/aab45b904141
changeset:   73926:aab45b904141
parent:      73924:423f47499e4a
parent:      73925:6040c248a199
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 10 12:44:37 2011 -0500
summary:
  merge 3.2

files:
  Lib/test/test_subprocess.py |  7 +------
  1 files changed, 1 insertions(+), 6 deletions(-)


diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- 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 @@
             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.

-- 
Repository URL: http://hg.python.org/cpython