From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 4 Jun 2012 17:59:07 +0000 (+0100)
Subject: Fix potential NameError in multiprocessing.Condition.wait()
X-Git-Tag: v3.3.0b1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86eb7e97aeb8dbd9589d2d300f7d139be4f20663;p=thirdparty%2FPython%2Fcpython.git

Fix potential NameError in multiprocessing.Condition.wait()
---

diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py
index 2c413a9b61ae..4502a97e99ac 100644
--- a/Lib/multiprocessing/synchronize.py
+++ b/Lib/multiprocessing/synchronize.py
@@ -216,7 +216,7 @@ class Condition(object):
 
         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 @@ class Condition(object):
             # 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'