From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 27 Jun 2006 07:34:37 +0000 (+0000)
Subject: Removed buggy exception handling in doRollover of rotating file handlers. Exceptions... 
X-Git-Tag: v2.5b2~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6dd59f1632fd174ffdd255acca4b596a69e1a5b4;p=python

Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller.
---

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index e0da254f31..70bd5d4fae 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -128,12 +128,7 @@ class RotatingFileHandler(BaseRotatingHandler):
             dfn = self.baseFilename + ".1"
             if os.path.exists(dfn):
                 os.remove(dfn)
-            try:
-                os.rename(self.baseFilename, dfn)
-            except (KeyboardInterrupt, SystemExit):
-                raise
-            except:
-                self.handleError(record)
+            os.rename(self.baseFilename, dfn)
             #print "%s -> %s" % (self.baseFilename, dfn)
         if self.encoding:
             self.stream = codecs.open(self.baseFilename, 'w', self.encoding)
@@ -273,12 +268,7 @@ class TimedRotatingFileHandler(BaseRotatingHandler):
         dfn = self.baseFilename + "." + time.strftime(self.suffix, timeTuple)
         if os.path.exists(dfn):
             os.remove(dfn)
-        try:
-            os.rename(self.baseFilename, dfn)
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except:
-            self.handleError(record)
+        os.rename(self.baseFilename, dfn)
         if self.backupCount > 0:
             # find the oldest log file and delete it
             s = glob.glob(self.baseFilename + ".20*")