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

[victor.stinner]

http://hg.python.org/cpython/rev/d944431a2b04
changeset:   68897:d944431a2b04
parent:      68894:d6bbde982c1c
parent:      68896:7a767910db5d
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Thu Mar 24 16:39:34 2011 +0100
summary:
  Merge 3.2

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
@@ -1100,7 +1100,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