merge 3.2

Lib/test/test_subprocess.py

@@ -18,6 +18,12 @@ try:
 except ImportError:
     gc = None
 
+
+try:
+    import resource
+except ImportError:
+    resource = None
+
 mswindows = (sys.platform == "win32")
 
 #
@@ -824,11 +830,11 @@ class _SuppressCoreFiles(object):
 
     def __enter__(self):
         """Try to save previous ulimit, then set it to (0, 0)."""
+        if resource is not None:
             try:
-            import resource
                 self.old_limit = resource.getrlimit(resource.RLIMIT_CORE)
                 resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
-        except (ImportError, ValueError, resource.error):
+            except (ValueError, resource.error):
                 pass
 
         if sys.platform == 'darwin':
@@ -850,10 +856,10 @@ class _SuppressCoreFiles(object):
         """Return core file behavior to default."""
         if self.old_limit is None:
             return
+        if resource is not None:
             try:
-            import resource
                 resource.setrlimit(resource.RLIMIT_CORE, self.old_limit)
-        except (ImportError, ValueError, resource.error):
+            except (ValueError, resource.error):
                 pass