summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-12-15 18:06:19 (GMT)
committerGuido van Rossum <guido@python.org>1997-12-15 18:06:19 (GMT)
commit92d91f56a77523d43265076f20e9820bacb40f46 (patch)
treee13aaf8524c9f72cbf125b9ee78468c6ef601a7a /Lib
parent97250cb2888ad7201df87be22d53ae3fa1ce3da6 (diff)
downloadcpython-92d91f56a77523d43265076f20e9820bacb40f46.zip
cpython-92d91f56a77523d43265076f20e9820bacb40f46.tar.gz
cpython-92d91f56a77523d43265076f20e9820bacb40f46.tar.bz2
Move %x test to nonstandard section because it appears to be locale specific.
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/test_strftime.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index 25cf935..f1db8df 100755
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -57,8 +57,7 @@ def strftest(now):
('%w', '%d' % ((1+now[6]) % 7), 'weekday as a number (Sun 1st)'),
('%W', '%02d' % ((now[7] + (jan1[6] - 1)%7)/7),
'week number of the year (Mon 1st)'),
- ('%x', '%02d/%02d/%02d' % (now[1], now[2], (now[0]%100)),
- '%m/%d/%y %H:%M:%S'),
+ # %x see below
('%X', '%02d:%02d:%02d' % (now[3], now[4], now[5]), '%H:%M:%S'),
('%y', '%02d' % (now[0]%100), 'year without century'),
('%Y', '%d' % now[0], 'year with century'),
@@ -69,6 +68,8 @@ def strftest(now):
nonstandard_expectations = (
# These are standard but don't have predictable output
('%c', fixasctime(time.asctime(now)), 'near-asctime() format'),
+ ('%x', '%02d/%02d/%02d' % (now[1], now[2], (now[0]%100)),
+ '%m/%d/%y %H:%M:%S'),
('(%Z)', '(%s)' % tz, 'time zone name'),
# These are some platform specific extensions