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

Tue Sep 20 20:58:42 CEST 2011

http://hg.python.org/cpython/rev/016543a9333a
changeset: 72425:016543a9333a
parent: 72424:ad0804d3dbd0
parent: 72422:1d91a3ba5c87
user: Barry Warsaw <barry at python.org>
date: Tue Sep 20 14:58:19 2011 -0400
summary:
 Head merge
files:
 Lib/test/test_multiprocessing.py | 14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -35,7 +35,13 @@
 import multiprocessing.heap
 import multiprocessing.pool
 
-from multiprocessing import util, reduction
+from multiprocessing import util
+
+try:
+ from multiprocessing import reduction
+ HAS_REDUCTION = True
+except ImportError:
+ HAS_REDUCTION = False
 
 try:
 from multiprocessing.sharedctypes import Value, copy
@@ -1631,6 +1637,7 @@
 os.write(fd, data)
 os.close(fd)
 
+ @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction")
 def test_fd_transfer(self):
 if self.TYPE != 'processes':
 self.skipTest("only makes sense with processes")
@@ -1648,6 +1655,7 @@
 with open(test.support.TESTFN, "rb") as f:
 self.assertEqual(f.read(), b"foo")
 
+ @unittest.skipUnless(HAS_REDUCTION, "test needs multiprocessing.reduction")
 @unittest.skipIf(sys.platform == "win32",
 "test semantics don't make sense on Windows")
 @unittest.skipIf(MAXFD <= 256,
@@ -1987,10 +1995,12 @@
 'multiprocessing', 'multiprocessing.connection',
 'multiprocessing.heap', 'multiprocessing.managers',
 'multiprocessing.pool', 'multiprocessing.process',
- 'multiprocessing.reduction',
 'multiprocessing.synchronize', 'multiprocessing.util'
 ]
 
+ if HAS_REDUCTION:
+ modules.append('multiprocessing.reduction')
+
 if c_int is not None:
 # This module requires _ctypes
 modules.append('multiprocessing.sharedctypes')
-- 
Repository URL: http://hg.python.org/cpython
