From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Oct 2015 02:34:46 +0000 (-0700)
Subject: use the with statement for locking the internal condition (closes #25362)
X-Git-Tag: v3.5.1rc1~180^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=414918a939b02aa3f7048ba341a3f6862ab9a71e;p=python

use the with statement for locking the internal condition (closes #25362)

Patch by Nir Soffer.
---

diff --git a/Lib/threading.py b/Lib/threading.py
index 80f809ce2f..56a4060337 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -511,12 +511,9 @@ class Event:
         that call wait() once the flag is true will not block at all.
 
         """
-        self._cond.acquire()
-        try:
+        with self._cond:
             self._flag = True
             self._cond.notify_all()
-        finally:
-            self._cond.release()
 
     def clear(self):
         """Reset the internal flag to false.
@@ -525,11 +522,8 @@ class Event:
         set the internal flag to true again.
 
         """
-        self._cond.acquire()
-        try:
+        with self._cond:
             self._flag = False
-        finally:
-            self._cond.release()
 
     def wait(self, timeout=None):
         """Block until the internal flag is true.
@@ -546,14 +540,11 @@ class Event:
         True except if a timeout is given and the operation times out.
 
         """
-        self._cond.acquire()
-        try:
+        with self._cond:
             signaled = self._flag
             if not signaled:
                 signaled = self._cond.wait(timeout)
             return signaled
-        finally:
-            self._cond.release()
 
 
 # A barrier class.  Inspired in part by the pthread_barrier_* api and