summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Gedminas <marius@gedmin.as>2014-09-03 10:46:09 +0300
committerMarius Gedminas <marius@gedmin.as>2014-09-03 10:58:38 +0300
commit04af83794742b1a9ca7cd787a72dfed4d15f5a97 (patch)
treea0452b762a407e753af5ccd389f9440d296d9ae2
parent178df1bae4af924ddbe791b0d3d557ad27148713 (diff)
downloadzope-i18n-04af83794742b1a9ca7cd787a72dfed4d15f5a97.tar.gz
Fix test failure due to renamed Australian timezone
Australia/Sydney uses the AEST/AEDT (Australian Eastern Standard/Daylight Time) abbreviations with pytz >= 2014.7. We need a different country that still uses 'EST'. (I hoped for one with a different UTC offset, but I can't seem to find one!)
-rw-r--r--src/zope/i18n/tests/test_formats.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/zope/i18n/tests/test_formats.py b/src/zope/i18n/tests/test_formats.py
index dc213ad..74baeef 100644
--- a/src/zope/i18n/tests/test_formats.py
+++ b/src/zope/i18n/tests/test_formats.py
@@ -320,10 +320,10 @@ class TestDateTimeFormat(TestCase):
self.assertEqual(dt.tzinfo.zone, 'US/Eastern')
self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
- dt = self.format.parse('01.01.2003 09:48 Australia/Sydney',
+ dt = self.format.parse('01.01.2003 09:48 Canada/Eastern',
'dd.MM.yyyy HH:mm zzzz')
- self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=11))
- self.assertEqual(dt.tzinfo.zone, 'Australia/Sydney')
+ self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-5))
+ self.assertEqual(dt.tzinfo.zone, 'Canada/Eastern')
self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
# Note that historical and future (as far as known)
@@ -340,7 +340,6 @@ class TestDateTimeFormat(TestCase):
self.assertEqual(dt.tzinfo.tzname(dt), 'EDT')
self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-4))
-
def testDateTimeParseError(self):
self.assertRaises(DateTimeParseError,
self.format.parse, '02.01.03 21:48', 'dd.MM.yyyy HH:mm')