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

[vinay.sajip]

Author: vinay.sajip
Date: Sat Feb 26 17:06:02 2011
New Revision: 88654

Log:
Issue #11330: Updated tests for correct asctime handling.

Modified:
   python/branches/py3k/Lib/logging/__init__.py
   python/branches/py3k/Lib/test/test_logging.py
   python/branches/release32-maint/Lib/logging/__init__.py
   python/branches/release32-maint/Lib/test/test_logging.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 17:06:02 2011
@@ -383,7 +383,7 @@
 class StringTemplateStyle(PercentStyle):
     default_format = '${message}'
     asctime_format = '${asctime}'
-    asctime_search = '${asctime'
+    asctime_search = '${asctime}'
 
     def __init__(self, fmt):
         self._fmt = fmt or self.default_format

Modified: python/branches/py3k/Lib/test/test_logging.py
==============================================================================
--- python/branches/py3k/Lib/test/test_logging.py	(original)
+++ python/branches/py3k/Lib/test/test_logging.py	Sat Feb 26 17:06:02 2011
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2011 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its
 # documentation for any purpose and without fee is hereby granted,
@@ -18,7 +18,7 @@
 
 """Test harness for the logging module. Run all tests.
 
-Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2011 Vinay Sajip. All Rights Reserved.
 """
 
 import logging

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 17:06:02 2011
@@ -383,7 +383,7 @@
 class StringTemplateStyle(PercentStyle):
     default_format = '${message}'
     asctime_format = '${asctime}'
-    asctime_search = '${asctime'
+    asctime_search = '${asctime}'
 
     def __init__(self, fmt):
         self._fmt = fmt or self.default_format

Modified: python/branches/release32-maint/Lib/test/test_logging.py
==============================================================================
--- python/branches/release32-maint/Lib/test/test_logging.py	(original)
+++ python/branches/release32-maint/Lib/test/test_logging.py	Sat Feb 26 17:06:02 2011
@@ -1907,6 +1907,8 @@
         self.assertFalse(f.usesTime())
         f = logging.Formatter('%(asctime)s')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('%(asctime)-15s')
+        self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime')
         self.assertFalse(f.usesTime())
 
@@ -1920,6 +1922,10 @@
         self.assertFalse(f.usesTime())
         f = logging.Formatter('{asctime}', style='{')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('{asctime!s:15}', style='{')
+        self.assertTrue(f.usesTime())
+        f = logging.Formatter('{asctime:15}', style='{')
+        self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime', style='{')
         self.assertFalse(f.usesTime())
 
@@ -1935,6 +1941,8 @@
         self.assertFalse(f.usesTime())
         f = logging.Formatter('${asctime}', style='$')
         self.assertTrue(f.usesTime())
+        f = logging.Formatter('${asctime', style='$')
+        self.assertFalse(f.usesTime())
         f = logging.Formatter('$asctime', style='$')
         self.assertTrue(f.usesTime())
         f = logging.Formatter('asctime', style='$')
@@ -2097,7 +2105,7 @@
                  LogRecordFactoryTest, ChildLoggerTest, QueueHandlerTest,
                  RotatingFileHandlerTest,
                  LastResortTest,
-                 #TimedRotatingFileHandlerTest
+                 TimedRotatingFileHandlerTest
                 )
 
 if __name__ == "__main__":