summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-02-26 16:06:02 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-02-26 16:06:02 (GMT)
commit399fc14609facd355720dbfa0310ed71e24faedd (patch)
tree501e015db3ec2ac01b6514ac75ecbaa717ff3e3f
parent4a7f2168a65ec5974d1005f48d79d3689a2ba0c8 (diff)
downloadcpython-399fc14609facd355720dbfa0310ed71e24faedd.zip
cpython-399fc14609facd355720dbfa0310ed71e24faedd.tar.gz
cpython-399fc14609facd355720dbfa0310ed71e24faedd.tar.bz2
Issue #11330: Updated tests for correct asctime handling.
-rw-r--r--Lib/logging/__init__.py2
-rw-r--r--Lib/test/test_logging.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index da12a0e..d9ac7d9 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -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
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 85c5312..b29d400 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -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