From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 25 Oct 2010 15:25:24 +0000 (+0000)
Subject: logging: Formatter implementation tweak.
X-Git-Tag: v3.2a4~352
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0557bfe77eeedf9f59e6ba2954ab785095244dc;p=thirdparty%2FPython%2Fcpython.git

logging: Formatter implementation tweak.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 0e29cf355c0f..b6dd2339a04f 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -482,6 +482,17 @@ class Formatter(object):
                      self._fmt.find("${asctime}") >= 0
         return result
 
+    def formatMessage(self, record):
+        style = self._style
+        if style == '%':
+            s = self._fmt % record.__dict__
+        elif style == '{':
+            s = self._fmt.format(**record.__dict__)
+        else:
+            from string import Template
+            s = Template(self._fmt).substitute(**record.__dict__)
+        return s
+
     def format(self, record):
         """
         Format the specified record as text.
@@ -498,14 +509,7 @@ class Formatter(object):
         record.message = record.getMessage()
         if self.usesTime():
             record.asctime = self.formatTime(record, self.datefmt)
-        style = self._style
-        if style == '%':
-            s = self._fmt % record.__dict__
-        elif style == '{':
-            s = self._fmt.format(**record.__dict__)
-        else:
-            from string import Template
-            s = Template(self._fmt).substitute(**record.__dict__)
+        s = self.formatMessage(record)
         if record.exc_info:
             # Cache the traceback text to avoid converting it multiple times
             # (it's constant anyway)