Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-27 19:54:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

SF bug [#410708] Condition.wait() and KeyboardInterrupt.

Browse source 
http://sourceforge.net/tracker/?func=detail&aid=410708&group_id=5470&atid=105470
Added try/finally around Condition.wait() guts, so that the lock state gets
restored at the end no matter what happens.
This commit is contained in:
Tim Peters 2001-04-02 20:15:57 +00:00
parent f5bd684337
commit c951bf9128
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/threading.py
View file

@ -185,6 +185,7 @@ def wait(self, timeout=None):
waiter.acquire() waiter.acquire()
self.__waiters.append(waiter) self.__waiters.append(waiter)
saved_state = self._release_save() saved_state = self._release_save()
try: # restore state no matter what (e.g., KeyboardInterrupt)
if timeout is None: if timeout is None:
waiter.acquire() waiter.acquire()
if __debug__: if __debug__:
@ -209,6 +210,7 @@ def wait(self, timeout=None):
else: else:
if __debug__: if __debug__:
self._note("%s.wait(%s): got it", self, timeout) self._note("%s.wait(%s): got it", self, timeout)
finally:
self._acquire_restore(saved_state) self._acquire_restore(saved_state)
def notify(self, n=1): def notify(self, n=1):