Merged fix added for recent changes in non-threading environments.

1 files changed, 8 insertions, 2 deletions

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 3bd423d..e79018f 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -914,9 +914,12 @@ class StreamHandler(Handler):
         """
         Flushes the stream.
         """
-        with self.lock:
+        self.acquire()
+        try:
             if self.stream and hasattr(self.stream, "flush"):
                 self.stream.flush()
+        finally:
+            self.release()
 
     def emit(self, record):
         """
@@ -965,13 +968,16 @@ class FileHandler(StreamHandler):
         """
         Closes the stream.
         """
-        with self.lock:
+        self.acquire()
+        try:
             if self.stream:
                 self.flush()
                 if hasattr(self.stream, "close"):
                     self.stream.close()
                 StreamHandler.close(self)
                 self.stream = None
+        finally:
+            self.release()
 
     def _open(self):
         """