From: Alex Willmer Date: Thu, 10 Sep 2015 19:25:45 +0000 (+0100) Subject: FixedOffsetTimezone: fix display of negative offsets X-Git-Tag: dev-2a51c9b95d06~26^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d816803400444d116ec285c38d6367d08a17b374;p=thirdparty%2Fbabel.git FixedOffsetTimezone: fix display of negative offsets --- diff --git a/babel/util.py b/babel/util.py index c3662141..495e9431 100644 --- a/babel/util.py +++ b/babel/util.py @@ -261,7 +261,7 @@ class FixedOffsetTimezone(tzinfo): def __init__(self, offset, name=None): self._offset = timedelta(minutes=offset) if name is None: - name = 'Etc/GMT+%d' % offset + name = 'Etc/GMT%+d' % offset self.zone = name def __str__(self): diff --git a/tests/test_util.py b/tests/test_util.py index 6ec73dc5..bb2bfdb4 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -11,6 +11,7 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://babel.edgewall.org/log/. +import unittest from babel import util @@ -39,3 +40,15 @@ def test_odict_pop(): assert False except KeyError: assert True + + +class FixedOffsetTimezoneTestCase(unittest.TestCase): + def test_zone_negative_offset(self): + self.assertEqual('Etc/GMT-60', util.FixedOffsetTimezone(-60).zone) + + def test_zone_zero_offset(self): + self.assertEqual('Etc/GMT+0', util.FixedOffsetTimezone(0).zone) + + def test_zone_positive_offset(self): + self.assertEqual('Etc/GMT+330', util.FixedOffsetTimezone(330).zone) +