python
diff --git a/‎Doc/library/concurrent.futures.rst
Copy file name to clipboardExpand all lines: Doc/library/concurrent.futures.rst
+1-2Lines changed: 1 addition & 2 deletions b/‎Doc/library/concurrent.futures.rst
Copy file name to clipboardExpand all lines: Doc/library/concurrent.futures.rst
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎Lib/concurrent/futures/_base.py
Copy file name to clipboardExpand all lines: Lib/concurrent/futures/_base.py
+1-4Lines changed: 1 addition & 4 deletions b/‎Lib/concurrent/futures/_base.py
Copy file name to clipboardExpand all lines: Lib/concurrent/futures/_base.py
+1-4Lines changed: 1 addition & 4 deletions
diff --git a/‎Lib/concurrent/futures/process.py
Copy file name to clipboardExpand all lines: Lib/concurrent/futures/process.py
+1-1Lines changed: 1 addition & 1 deletion b/‎Lib/concurrent/futures/process.py
Copy file name to clipboardExpand all lines: Lib/concurrent/futures/process.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Lib/test/test_concurrent_futures/executor.py
Copy file name to clipboardExpand all lines: Lib/test/test_concurrent_futures/executor.py
+6Lines changed: 6 additions & 0 deletions b/‎Lib/test/test_concurrent_futures/executor.py
Copy file name to clipboardExpand all lines: Lib/test/test_concurrent_futures/executor.py
+6Lines changed: 6 additions & 0 deletions
@@ -54,8 +54,7 @@ Executor Objects
       if :meth:`~iterator.__next__` is called and the result isn't available
       after *timeout* seconds from the original call to :meth:`Executor.map`.
       *timeout* can be an int or a float.  If *timeout* is not specified or
-      ``None``, there is no limit to the wait time. Incompatible with
-      *buffersize*.
+      ``None``, there is no limit to the wait time.
 
       If a *fn* call raises an exception, then that exception will be
       raised when its value is retrieved from the iterator.
 
@@ -581,7 +581,7 @@ def map(self, fn, *iterables, timeout=None, chunksize=1, buffersize=None):
             fn: A callable that will take as many arguments as there are
                 passed iterables.
             timeout: The maximum number of seconds to wait. If None, then there
-                is no limit on the wait time. Incompatible with buffersize.
+                is no limit on the wait time.
             chunksize: The size of the chunks the iterable will be broken into
                 before being passed to a child process. This argument is only
                 used by ProcessPoolExecutor; it is ignored by
@@ -603,9 +603,6 @@ def map(self, fn, *iterables, timeout=None, chunksize=1, buffersize=None):
         if buffersize is not None and buffersize < 1:
             raise ValueError("buffersize must be None or >= 1.")
 
-        if buffersize is not None and timeout is not None:
-            raise ValueError("cannot specify both buffersize and timeout.")
-
         if timeout is not None:
             end_time = timeout + time.monotonic()
 
 
@@ -820,7 +820,7 @@ def map(self, fn, *iterables, timeout=None, chunksize=1, buffersize=None):
             fn: A callable that will take as many arguments as there are
                 passed iterables.
             timeout: The maximum number of seconds to wait. If None, then there
-                is no limit on the wait time. Incompatible with buffersize.
+                is no limit on the wait time.
             chunksize: If greater than one, the iterables will be chopped into
                 chunks of size chunksize and submitted to the process pool.
                 If set to one, the items in the list will be sent one at a time.
 
@@ -85,6 +85,12 @@ def test_map_with_buffersize(self):
             list(map(str, it)),
         )
 
+    def test_map_with_buffersize_and_timeout(self):
+        it = self.executor.map(time.sleep, (0, 1), timeout=0.5)
+        next(it)
+        with self.assertRaises(TimeoutError):
+            next(it)
+
     def test_map_with_buffersize_on_infinite_iterable(self):
         results = self.executor.map(str, itertools.count(1), buffersize=1)
         self.assertEqual(next(iter(results)), "1")