[Python-checkins] cpython (merge 3.3 -> default): Closes #18941: Merged fix from 3.3.

[vinay.sajip]

http://hg.python.org/cpython/rev/7627fea85a6d
changeset:   85568:7627fea85a6d
parent:      85565:8002aee72837
parent:      85567:0577c9a82c0a
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Sep 06 10:26:48 2013 +0100
summary:
  Closes #18941: Merged fix from 3.3.

files:
  Lib/logging/__init__.py |  5 +++--
  Lib/logging/handlers.py |  6 ++++--
  2 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose and without fee is hereby granted,
@@ -18,7 +18,7 @@
 Logging package for Python. Based on PEP 282 and comments thereto in
 comp.lang.python.
 
-Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved.
 
 To use, simply 'import logging' and log away!
 """
@@ -971,6 +971,7 @@
         self.baseFilename = os.path.abspath(filename)
         self.mode = mode
         self.encoding = encoding
+        self.delay = delay
         if delay:
             #We don't open the stream, but we still need to call the
             #Handler constructor to set level, formatter, lock etc.
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -172,7 +172,8 @@
             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 @@
         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

-- 
Repository URL: http://hg.python.org/cpython