[Python-checkins] r88139 - in python/branches: py3k/Lib/logging/handlers.py py3k/Misc/NEWS release27-maint/Lib/logging/handlers.py release27-maint/Misc/NEWS release31-maint/Lib/logging/handlers.py release31-maint/Misc/NEWS

[vinay.sajip]

Author: vinay.sajip
Date: Sat Jan 22 00:35:57 2011
New Revision: 88139

Log:
Issue #10949: Improved robustness of rotating file handlers.

Modified:
   python/branches/py3k/Lib/logging/handlers.py
   python/branches/py3k/Misc/NEWS
   python/branches/release27-maint/Lib/logging/handlers.py
   python/branches/release27-maint/Misc/NEWS
   python/branches/release31-maint/Lib/logging/handlers.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/py3k/Lib/logging/handlers.py
==============================================================================
--- python/branches/py3k/Lib/logging/handlers.py	(original)
+++ python/branches/py3k/Lib/logging/handlers.py	Sat Jan 22 00:35:57 2011
@@ -120,6 +120,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         if self.backupCount > 0:
             for i in range(self.backupCount - 1, 0, -1):
                 sfn = "%s.%d" % (self.baseFilename, i)
@@ -316,6 +317,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         # get the time that this sequence started at and make it a TimeTuple
         t = self.rolloverAt - self.interval
         if self.utc:

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jan 22 00:35:57 2011
@@ -16,6 +16,8 @@
 Library
 -------
 
+- Issue #10949: Improved robustness of rotating file handlers.
+
 - Issue #10955: Fix a potential crash when trying to mmap() a file past its
   length.  Initial patch by Ross Lagerwall.
 

Modified: python/branches/release27-maint/Lib/logging/handlers.py
==============================================================================
--- python/branches/release27-maint/Lib/logging/handlers.py	(original)
+++ python/branches/release27-maint/Lib/logging/handlers.py	Sat Jan 22 00:35:57 2011
@@ -125,6 +125,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         if self.backupCount > 0:
             for i in range(self.backupCount - 1, 0, -1):
                 sfn = "%s.%d" % (self.baseFilename, i)
@@ -324,6 +325,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         # get the time that this sequence started at and make it a TimeTuple
         t = self.rolloverAt - self.interval
         if self.utc:

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Jan 22 00:35:57 2011
@@ -35,6 +35,8 @@
 Library
 -------
 
+- Issue #10949: Improved robustness of rotating file handlers.
+
 - Issue #10955: Fix a potential crash when trying to mmap() a file past its
   length.  Initial patch by Ross Lagerwall.
 

Modified: python/branches/release31-maint/Lib/logging/handlers.py
==============================================================================
--- python/branches/release31-maint/Lib/logging/handlers.py	(original)
+++ python/branches/release31-maint/Lib/logging/handlers.py	Sat Jan 22 00:35:57 2011
@@ -114,6 +114,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         if self.backupCount > 0:
             for i in range(self.backupCount - 1, 0, -1):
                 sfn = "%s.%d" % (self.baseFilename, i)
@@ -313,6 +314,7 @@
         """
         if self.stream:
             self.stream.close()
+            self.stream = None
         # get the time that this sequence started at and make it a TimeTuple
         t = self.rolloverAt - self.interval
         if self.utc:

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jan 22 00:35:57 2011
@@ -37,6 +37,8 @@
 Library
 -------
 
+- Issue #10949: Improved robustness of rotating file handlers.
+
 - Issue #10955: Fix a potential crash when trying to mmap() a file past its
   length.  Initial patch by Ross Lagerwall.