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

Thu Mar 24 16:39:50 CET 2011

http://hg.python.org/cpython/rev/7a767910db5d
changeset: 68896:7a767910db5d
branch: 3.2
parent: 68893:76a898433a02
parent: 68895:e53097288c8c
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Thu Mar 24 16:39:07 2011 +0100
summary:
 Merge 3.1
files:
 Lib/test/test_multiprocessing.py | 2 +-
 1 files changed, 1 insertions(+), 1 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
@@ -1088,7 +1088,7 @@
 self.pool.terminate()
 join = TimingWrapper(self.pool.join)
 join()
- self.assertTrue(join.elapsed < 0.5)
+ self.assertLess(join.elapsed, 0.5)
 
 def raising():
 raise KeyError("key")
-- 
Repository URL: http://hg.python.org/cpython
