From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Thu, 9 Jun 2011 17:42:19 +0000 (+0100)
Subject: Made time formats in Formatter more configurable.
X-Git-Tag: v3.3.0a1~2148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae5740f139304a2d032602f17b87ec485aa4c750;p=thirdparty%2FPython%2Fcpython.git

Made time formats in Formatter more configurable.
---

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 1a4b24122606..509dae627b4e 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -467,6 +467,9 @@ class Formatter(object):
         self._fmt = self._style._fmt
         self.datefmt = datefmt
 
+    default_time_format = '%Y-%m-%d %H:%M:%S'
+    default_msec_format = '%s,%03d'
+
     def formatTime(self, record, datefmt=None):
         """
         Return the creation time of the specified LogRecord as formatted text.
@@ -489,8 +492,8 @@ class Formatter(object):
         if datefmt:
             s = time.strftime(datefmt, ct)
         else:
-            t = time.strftime("%Y-%m-%d %H:%M:%S", ct)
-            s = "%s,%03d" % (t, record.msecs) # the use of % here is internal
+            t = time.strftime(self.default_time_format, ct)
+            s = self.default_msec_format % (t, record.msecs)
         return s
 
     def formatException(self, ei):