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

[antoine.pitrou]

http://hg.python.org/cpython/rev/aa9e88e4586a
changeset:   68832:aa9e88e4586a
parent:      68826:3114f26d5d54
parent:      68831:f3b8ebf28011
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Tue Mar 22 18:33:33 2011 +0100
summary:
  Merge

files:
  Doc/library/collections.abc.rst
  Doc/library/collections.rst

diff --git a/Doc/library/collections.abc.rst b/Doc/library/collections.abc.rst
--- a/Doc/library/collections.abc.rst
+++ b/Doc/library/collections.abc.rst
@@ -115,7 +115,7 @@
    That assumption is factored-out to an internal classmethod called
    :meth:`_from_iterable` which calls ``cls(iterable)`` to produce a new set.
    If the :class:`Set` mixin is being used in a class with a different
-   constructor signature, you will need to override :meth:`from_iterable`
+   constructor signature, you will need to override :meth:`_from_iterable`
    with a classmethod that can construct new instances from
    an iterable argument.
 
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -1,3 +1,4 @@
+
 :mod:`collections` --- Container datatypes
 ==========================================
 
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -155,7 +155,7 @@
 class WaitTests(unittest.TestCase):
     def test_first_completed(self):
         future1 = self.executor.submit(mul, 21, 2)
-        future2 = self.executor.submit(time.sleep, 5)
+        future2 = self.executor.submit(time.sleep, 1.5)
 
         done, not_done = futures.wait(
                 [CANCELLED_FUTURE, future1, future2],
@@ -165,7 +165,7 @@
         self.assertEqual(set([CANCELLED_FUTURE, future2]), not_done)
 
     def test_first_completed_some_already_completed(self):
-        future1 = self.executor.submit(time.sleep, 2)
+        future1 = self.executor.submit(time.sleep, 1.5)
 
         finished, pending = futures.wait(
                  [CANCELLED_AND_NOTIFIED_FUTURE, SUCCESSFUL_FUTURE, future1],
@@ -178,8 +178,8 @@
 
     def test_first_exception(self):
         future1 = self.executor.submit(mul, 2, 21)
-        future2 = self.executor.submit(sleep_and_raise, 5)
-        future3 = self.executor.submit(time.sleep, 10)
+        future2 = self.executor.submit(sleep_and_raise, 1.5)
+        future3 = self.executor.submit(time.sleep, 3)
 
         finished, pending = futures.wait(
                 [future1, future2, future3],
@@ -190,7 +190,7 @@
 
     def test_first_exception_some_already_complete(self):
         future1 = self.executor.submit(divmod, 21, 0)
-        future2 = self.executor.submit(time.sleep, 5)
+        future2 = self.executor.submit(time.sleep, 1.5)
 
         finished, pending = futures.wait(
                 [SUCCESSFUL_FUTURE,
@@ -235,14 +235,14 @@
 
     def test_timeout(self):
         future1 = self.executor.submit(mul, 6, 7)
-        future2 = self.executor.submit(time.sleep, 10)
+        future2 = self.executor.submit(time.sleep, 3)
 
         finished, pending = futures.wait(
                 [CANCELLED_AND_NOTIFIED_FUTURE,
                  EXCEPTION_FUTURE,
                  SUCCESSFUL_FUTURE,
                  future1, future2],
-                timeout=5,
+                timeout=1.5,
                 return_when=futures.ALL_COMPLETED)
 
         self.assertEqual(set([CANCELLED_AND_NOTIFIED_FUTURE,
@@ -332,8 +332,8 @@
         results = []
         try:
             for i in self.executor.map(time.sleep,
-                                       [0, 0, 10],
-                                       timeout=5):
+                                       [0, 0, 3],
+                                       timeout=1.5):
                 results.append(i)
         except futures.TimeoutError:
             pass

-- 
Repository URL: http://hg.python.org/cpython