[Python-checkins] r78703 - python/trunk/Lib/logging/init.py

Fri Mar 5 23:11:24 CET 2010

Author: vinay.sajip
Date: Fri Mar 5 23:11:24 2010
New Revision: 78703
Log:
Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future.
Modified:
 python/trunk/Lib/logging/__init__.py
Modified: python/trunk/Lib/logging/__init__.py
==============================================================================

--- python/trunk/Lib/logging/__init__.py	(original)
+++ python/trunk/Lib/logging/__init__.py	Fri Mar 5 23:11:24 2010
@@ -434,6 +434,12 @@
 s = s[:-1]
 return s
 
+ def usesTime(self):
+ """
+ Check if the format uses the creation time of the record.
+ """
+ return self._fmt.find("%(asctime)") >= 0
+
 def format(self, record):
 """
 Format the specified record as text.
@@ -442,13 +448,13 @@
 string formatting operation which yields the returned string.
 Before formatting the dictionary, a couple of preparatory steps
 are carried out. The message attribute of the record is computed
- using LogRecord.getMessage(). If the formatting string contains
- "%(asctime)", formatTime() is called to format the event time.
- If there is exception information, it is formatted using
- formatException() and appended to the message.
+ using LogRecord.getMessage(). If the formatting string uses the
+ time (as determined by a call to usesTime(), formatTime() is
+ called to format the event time. If there is exception information,
+ it is formatted using formatException() and appended to the message.
 """
 record.message = record.getMessage()
- if self._fmt.find("%(asctime)") >= 0:
+ if self.usesTime():
 record.asctime = self.formatTime(record, self.datefmt)
 s = self._fmt % record.__dict__
 if record.exc_info:


[Python-checkins] r78703 - python/trunk/Lib/logging/__init__.py

[Python-checkins] r78703 - python/trunk/Lib/logging/init.py