commit 86eb7e97aeb8dbd9589d2d300f7d139be4f20663
author Richard Oudkerk <shibturn@gmail.com> Mon Jun 04 18:59:07 2012 +0100
committer Richard Oudkerk <shibturn@gmail.com> Mon Jun 04 18:59:07 2012 +0100
tree 786ae3457296df1b4e67b38bad7cc402e65aa5b0
parent ad06444d6c52e614a65ee126bc4c916da0c2c57e

Fix potential NameError in multiprocessing.Condition.wait()

Lib/multiprocessing/synchronize.py

diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py
index 2c413a9..4502a97 100644
--- a/Lib/multiprocessing/synchronize.py
+++ b/Lib/multiprocessing/synchronize.py
@@ -216,7 +216,7 @@
 
         try:
             # wait for notification or timeout
-            ret = self._wait_semaphore.acquire(True, timeout)
+            return self._wait_semaphore.acquire(True, timeout)
         finally:
             # indicate that this thread has woken
             self._woken_count.release()
@@ -224,7 +224,6 @@
             # reacquire lock
             for i in range(count):
                 self._lock.acquire()
-            return ret
 
     def notify(self):
         assert self._lock._semlock._is_mine(), 'lock is not owned'