summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing/synchronize.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-06-04 18:59:07 +0100
committerRichard Oudkerk <shibturn@gmail.com>2012-06-04 18:59:07 +0100
commit0f44bc68eeb1327c8ff7f91b3532d93d7ed53b26 (patch)
tree4e7b53c599a1f19d6389fda278c8884aab72a998 /Lib/multiprocessing/synchronize.py
parent449b23c41551526824ef0e30f94788c9b21da7ba (diff)
downloadcpython-0f44bc68eeb1327c8ff7f91b3532d93d7ed53b26.tar.gz
Fix potential NameError in multiprocessing.Condition.wait()
Diffstat (limited to 'Lib/multiprocessing/synchronize.py')
-rw-r--r--Lib/multiprocessing/synchronize.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py
index 2c413a9b61..4502a97e99 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'