From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 13 Mar 2012 12:15:09 +0000 (+0000)
Subject: Closes #14267: Merged fix from 3.2.
X-Git-Tag: v3.3.0a2~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f15181d39a57382a218f8b98464b6a4881fa93a;p=thirdparty%2FPython%2Fcpython.git

Closes #14267: Merged fix from 3.2.
---

0f15181d39a57382a218f8b98464b6a4881fa93a
diff --cc Lib/logging/handlers.py
index ee0096a8cb79,73ce031545d9..bebd79a8fe1e
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@@ -363,11 -331,17 +366,18 @@@ class TimedRotatingFileHandler(BaseRota
              timeTuple = time.gmtime(t)
          else:
              timeTuple = time.localtime(t)
+             dstThen = timeTuple[-1]
+             if dstNow != dstThen:
+                 if dstNow:
+                     addend = 3600
+                 else:
+                     addend = -3600
+                 timeTuple = time.localtime(t + addend)
 -        dfn = self.baseFilename + "." + time.strftime(self.suffix, timeTuple)
 +        dfn = self.rotation_filename(self.baseFilename + "." +
 +                                     time.strftime(self.suffix, timeTuple))
          if os.path.exists(dfn):
              os.remove(dfn)
 -        os.rename(self.baseFilename, dfn)
 +        self.rotate(self.baseFilename, dfn)
          if self.backupCount > 0:
              for s in self.getFilesToDelete():
                  os.remove(s)