From: Richard Oudkerk <shibturn@gmail.com>
Date: Sun, 6 May 2012 15:45:02 +0000 (+0100)
Subject: Make AcquirerProxy.acquire() support timeout argument
X-Git-Tag: v3.3.0a4~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41eb85b194909d68bb05b81442f10026b9279560;p=thirdparty%2FPython%2Fcpython.git

Make AcquirerProxy.acquire() support timeout argument
---

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index dc8166a997aa..36bcf8f07a20 100644
--- 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):