diff options
| author | Guido van Rossum <guido@python.org> | 1997-08-18 15:37:38 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-08-18 15:37:38 (GMT) |
| commit | e7038425b1480abe03fb579384d9667d26191d10 (patch) | |
| tree | f6ac5807f3ac6116560e9663bafc5279e0c62d80 | |
| parent | f07eaea13400c389751d4c398a64038753f5b851 (diff) | |
| download | cpython-e7038425b1480abe03fb579384d9667d26191d10.zip cpython-e7038425b1480abe03fb579384d9667d26191d10.tar.gz cpython-e7038425b1480abe03fb579384d9667d26191d10.tar.bz2 | |
Tweaks to cope with strftime returning 0 without error for %Z
| -rwxr-xr-x | Lib/test/test_strftime.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_time.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 2596287..25cf935 100755 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -69,7 +69,7 @@ def strftest(now): nonstandard_expectations = ( # These are standard but don't have predictable output ('%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 ('%D', '%02d/%02d/%02d' % (now[1], now[2], (now[0]%100)), 'mm/dd/yy'), diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 85ea6ee..acc4d41 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -16,8 +16,11 @@ tt = time.gmtime(t) for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'H', 'I', 'j', 'm', 'M', 'p', 'S', 'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'): - format = '%' + directive - time.strftime(format, tt) + format = ' %' + directive + try: + time.strftime(format, tt) + except ValueError: + print 'conversion specifier:', format, ' failed.' time.timezone time.tzname |