mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-01-20 15:34:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #11330: Updated tests for correct asctime handling.

Browse Source
This commit is contained in:
Vinay Sajip 2011-02-26 16:06:02 +00:00
parent ed0473cfaf
commit 89807a5277
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/logging/__init__.py
View File

@ -383,7 +383,7 @@ class StrFormatStyle(PercentStyle):
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

10
Lib/test/test_logging.py
View File

@ -1907,6 +1907,8 @@ class FormatterTest(unittest.TestCase):
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 @@ class FormatterTest(unittest.TestCase):
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 @@ class FormatterTest(unittest.TestCase):
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 @@ def test_main():
LogRecordFactoryTest, ChildLoggerTest, QueueHandlerTest,
RotatingFileHandlerTest,
LastResortTest,
#TimedRotatingFileHandlerTest
TimedRotatingFileHandlerTest
)
if __name__ == "__main__":