merge 3.2

This commit is contained in:
Benjamin Peterson 2011-12-10 12:44:37 -05:00
commit ce2af33562

View file

@ -13,11 +13,7 @@ import sysconfig
import warnings import warnings
import select import select
import shutil import shutil
try: import gc
import gc
except ImportError:
gc = None
try: try:
import resource import resource
@ -951,7 +947,6 @@ class POSIXProcessTestCase(BaseTestCase):
self.fail("Exception raised by preexec_fn did not make it " self.fail("Exception raised by preexec_fn did not make it "
"to the parent process.") "to the parent process.")
@unittest.skipUnless(gc, "Requires a gc module.")
def test_preexec_gc_module_failure(self): def test_preexec_gc_module_failure(self):
# This tests the code that disables garbage collection if the child # This tests the code that disables garbage collection if the child
# process will execute any Python. # process will execute any Python.