Issue #11714: Use 'with' statements to assure a Semaphore releases a

condition variable.  Original patch by Thomas Rachel.

Lib/threading.py

@@ -248,31 +248,29 @@ class Semaphore:
             raise ValueError("can't specify timeout for non-blocking acquire")
         rc = False
         endtime = None
-        self._cond.acquire()
+        with self._cond:
-        while self._value == 0:
+            while self._value == 0:
-            if not blocking:
+                if not blocking:
-                break
+                    break
-            if timeout is not None:
+                if timeout is not None:
-                if endtime is None:
+                    if endtime is None:
-                    endtime = _time() + timeout
+                        endtime = _time() + timeout
-                else:
+                    else:
-                    timeout = endtime - _time()
+                        timeout = endtime - _time()
-                    if timeout <= 0:
+                        if timeout <= 0:
-                        break
+                            break
-            self._cond.wait(timeout)
+                self._cond.wait(timeout)
-        else:
+            else:
-            self._value = self._value - 1
+                self._value = self._value - 1
-            rc = True
+                rc = True
-        self._cond.release()
         return rc
 
     __enter__ = acquire
 
     def release(self):
-        self._cond.acquire()
+        with self._cond:
-        self._value = self._value + 1
+            self._value = self._value + 1
-        self._cond.notify()
+            self._cond.notify()
-        self._cond.release()
 
     def __exit__(self, t, v, tb):
         self.release()

Misc/ACKS

@@ -970,6 +970,7 @@ Fernando Pérez
 Pierre Quentel
 Brian Quinlan
 Anders Qvist
+Thomas Rachel
 Jérôme Radix
 Burton Radons
 Jeff Ramnani

Misc/NEWS

@@ -36,6 +36,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11714: Use 'with' statements to assure a Semaphore releases a
+  condition variable.  Original patch by Thomas Rachel.
+
 - Issue #17795: Reverted backwards-incompatible change in SysLogHandler with
   Unix domain sockets.