Changeset 6749

Timestamp:

11/29/07 13:39:46 (9 months ago)

Author:

mtredinnick

Message:

Fixed #6023 -- Fixed daylight savings determination for years beyond 2038 on
32-bit systems (modulo the fact that the system timezone libraries might not be
accurate that far out; at least we don't crash now). Thanks, SmileyChris?.

Files:

• django/trunk/django/utils/tzinfo.py (modified) (1 diff)
• django/trunk/tests/regressiontests/dateformat/tests.py (modified) (2 diffs)

django/trunk/django/utils/tzinfo.py

@@ -55 +55 @@
-    def _isdst(self, dt):
-        tt = (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second, dt.weekday(), 0, -1)
-
+
+
+
+
+
+
+
-        tt = time.localtime(stamp)
-        return tt.tm_isdst > 0

django/trunk/tests/regressiontests/dateformat/tests.py

@@ -67 +67 @@
->>> format(my_birthday, r'jS o\f F')
-u'8th of July'
+
+>>> format(the_future, r'Y')
+u'2100'
-"""
-
@@ -85 +88 @@
-summertime = datetime.datetime(2005, 10, 30, 1, 00)
-wintertime = datetime.datetime(2005, 10, 30, 4, 00)
+the_future = datetime.datetime(2100, 10, 25, 0, 00)