Make AcquirerProxy.acquire() support timeout argument

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index dc8166a997aadeb6d4cdfbbeef1687088c43c1db..36bcf8f07a204157cc3fbfab86b2af71d763c957 100644 (file)
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -957,8 +957,9 @@ class IteratorProxy(BaseProxy):
 
 class AcquirerProxy(BaseProxy):
     _exposed_ = ('acquire', 'release')
-    def acquire(self, blocking=True):
-        return self._callmethod('acquire', (blocking,))
+    def acquire(self, blocking=True, timeout=None):
+        args = (blocking,) if timeout is None else (blocking, timeout)
+        return self._callmethod('acquire', args)
     def release(self):
         return self._callmethod('release')
     def __enter__(self):