From 50ace2e5c9c546141b180b3e3209f50fa70f4323 Mon Sep 17 00:00:00 2001 From: "vinay.sajip" Date: Tue, 27 Jun 2006 07:34:37 +0000 Subject: [PATCH] Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller. git-svn-id: http://svn.python.org/projects/python/trunk@47121 6015fed2-1504-0410-9fe1-9d1591cc4771 --- Lib/logging/handlers.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) 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*") -- 2.11.4.GIT