Ticket #10979: 10979-utils_tzinfo-r10651.patch

django/utils/tzinfo.py

@@ -20 +20 @@
         else:
             self.__offset = timedelta(minutes=offset)
 
-        self.__name = u"%+03d%02d" % (offset / 60, offset % 60)
+        sign = offset < 0 and '-' or '+'
+        self.__name = u"%s%02d%02d" % (sign, abs(offset) / 60., abs(offset) % 60)
 
     def __repr__(self):
         return self.__name

tests/regressiontests/utils/tests.py

@@ -9 +9 @@
 import timesince
 import datastructures
 import itercompat
+import tzinfo
 from decorators import DecoratorFromMiddlewareTests
 
 # We need this because "datastructures" uses sorted() and the tests are run in
@@ -23 +24 @@
     'timesince': timesince,
     'datastructures': datastructures,
     'itercompat': itercompat,
+    'tzinfo': tzinfo,
 }
 
 class TestUtilsHtml(TestCase):

tests/regressiontests/utils/tzinfo.py

@@ +1 @@
+"""
+>>> from django.utils.tzinfo import FixedOffset
+
+>>> FixedOffset(0)
++0000
+>>> FixedOffset(60)
++0100
+>>> FixedOffset(-60)
+-0100
+>>> FixedOffset(280)
++0440
+>>> FixedOffset(-280)
+-0440
+>>> FixedOffset(-78.4)
+-0118
+>>> FixedOffset(78.4)
++0118
+>>> FixedOffset(-5.5*60)
+-0530
+>>> FixedOffset(5.5*60)
++0530
+>>> FixedOffset(-.5*60)
+-0030
+>>> FixedOffset(.5*60)
++0030
+"""
+
+if __name__ == "__main__":
+    import doctest
+    doctest.testmod()