mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Tweaks to cope with strftime returning 0 without error for %Z

Browse source
This commit is contained in:
Guido van Rossum 1997-08-18 15:37:38 +00:00
parent f07eaea134
commit e7038425b1
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_strftime.py
View file

@ -69,7 +69,7 @@ def strftest(now):
nonstandard_expectations = ( nonstandard_expectations = (
# These are standard but don't have predictable output # These are standard but don't have predictable output
('%c', fixasctime(time.asctime(now)), 'near-asctime() format'), ('%c', fixasctime(time.asctime(now)), 'near-asctime() format'),
('%Z', tz, 'time zone name'), ('(%Z)', '(%s)' % tz, 'time zone name'),
# These are some platform specific extensions # These are some platform specific extensions
('%D', '%02d/%02d/%02d' % (now[1], now[2], (now[0]%100)), 'mm/dd/yy'), ('%D', '%02d/%02d/%02d' % (now[1], now[2], (now[0]%100)), 'mm/dd/yy'),

7
Lib/test/test_time.py
View file

@ -16,8 +16,11 @@ tt = time.gmtime(t)
for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'H', 'I', for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'H', 'I',
'j', 'm', 'M', 'p', 'S', 'j', 'm', 'M', 'p', 'S',
'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'): 'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'):
format = '%' + directive format = ' %' + directive
time.strftime(format, tt) try:
time.strftime(format, tt)
except ValueError:
print 'conversion specifier:', format, ' failed.'
time.timezone time.timezone
time.tzname time.tzname