Permalink
Browse files

Fixed #10979 -- Fixed misleading FixedOffset.__repr__(). Thanks, gsong

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent ddd6f28 commit a7dc2c06532586f8988d04d8f697c4ebfcabfde8 @adrianholovaty adrianholovaty committed Jan 10, 2010
Showing with 34 additions and 1 deletion.
  1. +2 −1 django/utils/tzinfo.py
  2. +2 −0 tests/regressiontests/utils/tests.py
  3. +30 −0 tests/regressiontests/utils/tzinfo.py
View
3 django/utils/tzinfo.py
@@ -13,7 +13,8 @@ def __init__(self, offset):
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
View
2 tests/regressiontests/utils/tests.py
@@ -10,6 +10,7 @@
import timesince
import datastructures
import itercompat
+import tzinfo
from decorators import DecoratorFromMiddlewareTests
from functional import FunctionalTestCase
@@ -26,6 +27,7 @@
'timesince': timesince,
'datastructures': datastructures,
'itercompat': itercompat,
+ 'tzinfo': tzinfo,
}
from dateformat import *
View
30 tests/regressiontests/utils/tzinfo.py
@@ -0,0 +1,30 @@
+"""
+>>> 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()

0 comments on commit a7dc2c0

Please sign in to comment.