[Python-checkins] r88644 - in python/branches: py3k/Lib/logging/__init__.py release32-maint/Lib/logging/__init__.py

[vinay.sajip]

Author: vinay.sajip
Date: Sat Feb 26 15:15:48 2011
New Revision: 88644

Log:
Issue #11330: asctime format bug fixed.

Modified:
   python/branches/py3k/Lib/logging/__init__.py
   python/branches/release32-maint/Lib/logging/__init__.py

Modified: python/branches/py3k/Lib/logging/__init__.py
==============================================================================
--- python/branches/py3k/Lib/logging/__init__.py	(original)
+++ python/branches/py3k/Lib/logging/__init__.py	Sat Feb 26 15:15:48 2011
@@ -360,12 +360,13 @@
 
     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 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 StringTemplateStyle(PercentStyle):
     default_format = '${message}'
     asctime_format = '${asctime}'
+    asctime_search = '{asctime'
 
     def __init__(self, fmt):
         self._fmt = fmt or self.default_format

Modified: python/branches/release32-maint/Lib/logging/__init__.py
==============================================================================
--- python/branches/release32-maint/Lib/logging/__init__.py	(original)
+++ python/branches/release32-maint/Lib/logging/__init__.py	Sat Feb 26 15:15:48 2011
@@ -360,12 +360,13 @@
 
     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 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 StringTemplateStyle(PercentStyle):
     default_format = '${message}'
     asctime_format = '${asctime}'
+    asctime_search = '{asctime'
 
     def __init__(self, fmt):
         self._fmt = fmt or self.default_format