summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2000-09-15 12:57:35 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2000-09-15 12:57:35 (GMT)
commit00ce51e38e92414bd5fb9ab6e5f439de2dd12177 (patch)
tree5ec2d7ede8c83f1b99da688149e9b997c3b3ab7c
parenta454ebd924a9cb1de554933c8aaed5994d7ef94f (diff)
downloadcpython-00ce51e38e92414bd5fb9ab6e5f439de2dd12177.zip
cpython-00ce51e38e92414bd5fb9ab6e5f439de2dd12177.tar.gz
cpython-00ce51e38e92414bd5fb9ab6e5f439de2dd12177.tar.bz2
Allow am/pm as well as AM/PM (C9X behaviour).
-rwxr-xr-xLib/test/test_strftime.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index c713d05..7f5cb80 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -23,8 +23,8 @@ def strftest(now):
gmt = time.gmtime(now)
now = time.localtime(now)
- if now[3] < 12: ampm='AM'
- else: ampm='PM'
+ if now[3] < 12: ampm='(AM|am)'
+ else: ampm='(PM|pm)'
jan1 = time.localtime(time.mktime((now[0], 1, 1) + (0,)*6))