From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Fri, 15 Nov 2013 20:40:27 +0000 (+0000)
Subject: Issue #19523: Closed FileHandler leak which occurred when delay was set.
X-Git-Tag: v3.4.0b1~264^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a76157dca6ba0d063a88cf4c0b6ac132881001b1;p=thirdparty%2FPython%2Fcpython.git

Issue #19523: Closed FileHandler leak which occurred when delay was set.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 4cef66fa139e..7f94e39f0f52 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -976,8 +976,10 @@ class FileHandler(StreamHandler):
                 self.flush()
                 if hasattr(self.stream, "close"):
                     self.stream.close()
-                StreamHandler.close(self)
                 self.stream = None
+            # Issue #19523: call unconditionally to
+            # prevent a handler leak when delay is set
+            StreamHandler.close(self)
         finally:
             self.release()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 9f99095924b8..d5d0637fb49e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #19523: Closed FileHandler leak which occurred when delay was set.
+
 - Issue #13674: Prevented time.strftime from crashing on Windows when given
   a year before 1900 and a format of %y.