Author: adrian
Date: 2010-01-10 11:28:20 -0600 (Sun, 10 Jan 2010)
New Revision: 12164
Added:
django/trunk/tests/regressiontests/utils/tzinfo.py
Modified:
django/trunk/django/utils/tzinfo.py
django/trunk/tests/regressiontests/utils/tests.py
Log:
Fixed #10979 -- Fixed misleading FixedOffset.__repr__(). Thanks, gsong
Modified: django/trunk/django/utils/tzinfo.py
===================================================================
--- django/trunk/django/utils/tzinfo.py 2010-01-10 17:25:44 UTC (rev 12163)
+++ django/trunk/django/utils/tzinfo.py 2010-01-10 17:28:20 UTC (rev 12164)
@@ -13,7 +13,8 @@
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
Modified: django/trunk/tests/regressiontests/utils/tests.py
===================================================================
--- django/trunk/tests/regressiontests/utils/tests.py 2010-01-10 17:25:44 UTC
(rev 12163)
+++ django/trunk/tests/regressiontests/utils/tests.py 2010-01-10 17:28:20 UTC
(rev 12164)
@@ -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 *
Added: django/trunk/tests/regressiontests/utils/tzinfo.py
===================================================================
--- django/trunk/tests/regressiontests/utils/tzinfo.py
(rev 0)
+++ django/trunk/tests/regressiontests/utils/tzinfo.py 2010-01-10 17:28:20 UTC
(rev 12164)
@@ -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()
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
