diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-09-06 10:26:48 +0100 |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-09-06 10:26:48 +0100 |
commit | f7b436ce8d69e1067cf2cb3769de93605b307327 (patch) | |
tree | 588cde0d7785261f19b31a0c28edb4c44b181428 /Lib/logging/handlers.py | |
parent | a92a3564a92834c354712229942f70e6e5620371 (diff) | |
parent | 43c6ef189955474001aad75d3b47d895180b2d42 (diff) | |
download | cpython-git-f7b436ce8d69e1067cf2cb3769de93605b307327.tar.gz |
Closes #18941: Merged fix from 3.3.
Diffstat (limited to 'Lib/logging/handlers.py')
-rw-r--r-- | Lib/logging/handlers.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index b67a8ac140..0ae6e45abf 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -172,7 +172,8 @@ class RotatingFileHandler(BaseRotatingHandler): if os.path.exists(dfn): os.remove(dfn) self.rotate(self.baseFilename, dfn) - self.stream = self._open() + if not self.delay: + self.stream = self._open() def shouldRollover(self, record): """ @@ -394,7 +395,8 @@ class TimedRotatingFileHandler(BaseRotatingHandler): if self.backupCount > 0: for s in self.getFilesToDelete(): os.remove(s) - self.stream = self._open() + if not self.delay: + self.stream = self._open() newRolloverAt = self.computeRollover(currentTime) while newRolloverAt <= currentTime: newRolloverAt = newRolloverAt + self.interval |