From 10914b7473262a108b1de4a72c90d1203471102e Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Sat, 26 Feb 2011 14:15:48 +0000 Subject: [PATCH] Issue #11330: asctime format bug fixed. --- Lib/logging/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index e1c4a37b535..d61699e035c 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -360,12 +360,13 @@ class PercentStyle(object): default_format = '%(message)s' asctime_format = '%(asctime)s' + asctime_search = '%(asctime)' def __init__(self, fmt): self._fmt = fmt or self.default_format def usesTime(self): - return self._fmt.find(self.asctime_format) >= 0 + return self._fmt.find(self.asctime_search) >= 0 def format(self, record): return self._fmt % record.__dict__ @@ -373,6 +374,7 @@ class PercentStyle(object): class StrFormatStyle(PercentStyle): default_format = '{message}' asctime_format = '{asctime}' + asctime_search = '{asctime' def format(self, record): return self._fmt.format(**record.__dict__) @@ -381,6 +383,7 @@ class StrFormatStyle(PercentStyle): class StringTemplateStyle(PercentStyle): default_format = '${message}' asctime_format = '${asctime}' + asctime_search = '{asctime' def __init__(self, fmt): self._fmt = fmt or self.default_format