From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 26 Feb 2011 16:00:04 +0000 (+0000)
Subject: Issue #11330: Added regression test.
X-Git-Tag: v3.3.0a1~3040
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a7f2168a65ec5974d1005f48d79d3689a2ba0c8;p=thirdparty%2FPython%2Fcpython.git

Issue #11330: Added regression test.
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index f9da87b6f1fb..85c5312053cf 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -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='$')