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

Sat Dec 10 18:40:00 CET 2011

http://hg.python.org/cpython/rev/423f47499e4a
changeset: 73924:423f47499e4a
parent: 73921:e37a7dc8944e
parent: 73923:245f6094ccba
user: Benjamin Peterson <benjamin at python.org>
date: Sat Dec 10 12:38:52 2011 -0500
summary:
 merge 3.2
files:
 Lib/test/test_subprocess.py | 28 +++++++++++++++---------
 1 files changed, 17 insertions(+), 11 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
@@ -18,6 +18,12 @@
 except ImportError:
 gc = None
 
+
+try:
+ import resource
+except ImportError:
+ resource = None
+
 mswindows = (sys.platform == "win32")
 
 #
@@ -824,12 +830,12 @@
 
 def __enter__(self):
 """Try to save previous ulimit, then set it to (0, 0)."""
- try:
- import resource
- self.old_limit = resource.getrlimit(resource.RLIMIT_CORE)
- resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
- except (ImportError, ValueError, resource.error):
- pass
+ if resource is not None:
+ try:
+ self.old_limit = resource.getrlimit(resource.RLIMIT_CORE)
+ resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
+ except (ValueError, resource.error):
+ pass
 
 if sys.platform == 'darwin':
 # Check if the 'Crash Reporter' on OSX was configured
@@ -850,11 +856,11 @@
 """Return core file behavior to default."""
 if self.old_limit is None:
 return
- try:
- import resource
- resource.setrlimit(resource.RLIMIT_CORE, self.old_limit)
- except (ImportError, ValueError, resource.error):
- pass
+ if resource is not None:
+ try:
+ resource.setrlimit(resource.RLIMIT_CORE, self.old_limit)
+ except (ValueError, resource.error):
+ pass
 
 
 @unittest.skipIf(mswindows, "POSIX specific tests")
-- 
Repository URL: http://hg.python.org/cpython
