diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-12-21 14:17:12 -0600 |
| commit | f2b234443c53cb73dc749da57d952286437cb15a (patch) | |
| tree | f21b8b25f5bfbe76a2c85ae62f6d06060dd03372 /Lib/test/datetimetester.py | |
| parent | 26b842a82d9ae7d30c692080bf352a0ef78a626c (diff) | |
| parent | 977fd6d7c6593680fd5ffdebb262a2a3f2f24387 (diff) | |
| download | cpython-f2b234443c53cb73dc749da57d952286437cb15a.tar.gz | |
Issue #25827: Merge with 3.5
Diffstat (limited to 'Lib/test/datetimetester.py')
| -rw-r--r-- | Lib/test/datetimetester.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 6365c60579..7374608a66 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -281,7 +281,8 @@ class TestTimeZone(unittest.TestCase): with self.assertRaises(TypeError): self.EST.dst(5) def test_tzname(self): - self.assertEqual('UTC+00:00', timezone(ZERO).tzname(None)) + self.assertEqual('UTC', timezone.utc.tzname(None)) + self.assertEqual('UTC', timezone(ZERO).tzname(None)) self.assertEqual('UTC-05:00', timezone(-5 * HOUR).tzname(None)) self.assertEqual('UTC+09:30', timezone(9.5 * HOUR).tzname(None)) self.assertEqual('UTC-00:01', timezone(timedelta(minutes=-1)).tzname(None)) |