Commit 059891ab authored by Guido van Rossum's avatar Guido van Rossum

Different operation in verbose mode: show the supported nonstandard

options.  Also added two: %n and %t (newline and tab character).
parent 2abf57a9
...@@ -80,18 +80,32 @@ nonstandard_expectations = ( ...@@ -80,18 +80,32 @@ nonstandard_expectations = (
('%s', '%d' % nowsecs, 'seconds since the Epoch in UCT'), ('%s', '%d' % nowsecs, 'seconds since the Epoch in UCT'),
('%3y', '%03d' % (now[0]%100), ('%3y', '%03d' % (now[0]%100),
'year without century rendered using fieldwidth'), 'year without century rendered using fieldwidth'),
('%n', '\n', 'newline character'),
('%t', '\t', 'tab character'),
) )
if verbose: if verbose:
print "Strftime test, platform: %s, Python version: %s" % \ print "Strftime test, platform: %s, Python version: %s" % \
(sys.platform, string.split(sys.version)[0]) (sys.platform, string.split(sys.version)[0])
expectations = expectations + nonstandard_expectations
for e in expectations: for e in expectations:
result = time.strftime(e[0], now) result = time.strftime(e[0], now)
if result == e[1]: continue if result == e[1]: continue
if result[0] == '%': if result[0] == '%':
print "Does not appear to support '%s' format" % e[0] print "Does not support standard '%s' format (%s)" % (e[0], e[2])
else: else:
print "Conflict for %s (%s):" % (e[0], e[2]) print "Conflict for %s (%s):" % (e[0], e[2])
print " Expected %s, but got %s" % (e[1], result) print " Expected %s, but got %s" % (e[1], result)
for e in nonstandard_expectations:
result = time.strftime(e[0], now)
if result == e[1]:
if verbose:
print "Supports nonstandard '%s' format (%s)" % (e[0], e[2])
elif result[0] == '%':
if verbose:
print "Does not appear to support '%s' format" % e[0]
else:
if verbose:
print "Conflict for %s (%s):" % (e[0], e[2])
print " Expected %s, but got %s" % (e[1], result)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment