Ticket #479: django-tzinfo.patch

utils/tzinfo.py

@@ +1 @@
+"""Implementation of a tzinfo-classes for use with datetime.datetime."""
+
+import time
+from datetime import timedelta, tzinfo
+
+ZERO = timedelta(0)
+STDOFFSET = timedelta(seconds=-time.timezone)
+DSTOFFSET = timedelta(seconds=-time.altzone)
+DSTDIFF = DSTOFFSET - STDOFFSET
+
+class FixedOffset(tzinfo):
+    """Fixed offset in minutes east from UTC."""
+
+    def __init__(self, offset):
+        self.__offset = timedelta(minutes=offset)
+        # FIXME -- Not really a name...
+        self.__name = "%+03d%02d" % (offset / 60, offset % 60)
+
+    def utcoffset(self, dt):
+        return self.__offset
+
+    def tzname(self, dt):
+        return self.__name
+
+    def dst(self, dt):
+        return ZERO
+
+class LocalTimezone(tzinfo):
+    """Proxy timezone information from time module."""
+
+    def utcoffset(self, dt):
+        if self._isdst(dt):
+            return DSTOFFSET
+        else:
+            return STDOFFSET
+
+    def dst(self, dt):
+        if self._isdst(dt):
+            return DSTDIFF
+        else:
+            return ZERO
+
+    def tzname(self, dt):
+        return time.tzname[self._isdst(dt)]
+
+    def _isdst(self, dt):
+        tt = (dt.year, dt.month, dt.day,
+              dt.hour, dt.minute, dt.second,
+              dt.weekday(), 0, -1)
+        stamp = time.mktime(tt)
+        tt = time.localtime(stamp)
+        return tt.tm_isdst > 0

utils/dateformat.py

@@ -11 +11 @@
->>>
-"""
-
+# FIXME -- Try this in a template and weep
+#   { now:"\T\h\i\s \i\s \e\s\c\a\p\e\d" }
+# or
+#   { now:"\\T\\h\\i\\s \\i\\s \\e\\s\\c\\a\\p\\e\\d" }
+
-from calendar import isleap
-from dates import MONTHS, MONTHS_AP, WEEKDAYS
+from tzinfo import LocalTimezone
-
-class DateFormat:
-    year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
@@ -20 +26 @@
-    def __init__(self, d):
-        self.date = d
-
+        if self.date.tzinfo:
+            self.timezone = self.date.tzinfo
+        else:
+            self.timezone = LocalTimezone(self.date)
+
-    def a(self):
-        "'a.m.' or 'p.m.'"
-        if self.date.hour > 11:
@@ -84 +95 @@
-
-    def I(self):
-        "'1' if Daylight Savings Time, '0' otherwise."
-aise NotImplementedError
+eturn self.timezone.dst()
-
-    def j(self):
-        "Day of the month without leading zeros; i.e. '1' to '31'"
@@ -116 +127 @@
-
-    def O(self):
-        "Difference to Greenwich time in hours; e.g. '+0200'"
-
+
+
-
-    def P(self):
-        """
@@ -158 +170 @@
-
-    def T(self):
-        "Time zone of this machine; e.g. 'EST' or 'MDT'"
-aise NotImplementedError
+eturn self.timezone.tzname(self.date)
-
-    def U(self):
-        "Seconds since the Unix epoch (January 1 1970 00:00:00 GMT)"
@@ -216 +228 @@
-        """Time zone offset in seconds (i.e. '-43200' to '43200'). The offset
-        for timezones west of UTC is always negative, and for those east of UTC
-        is always positive."""
-aise NotImplementedError
+eturn self.timezone.utcoffset(self.date).seconds
-
-    def format(self, formatstr):
-        result = ''
-        for char in formatstr:
-try
+if hasattr(self, char)
-                result += str(getattr(self, char)())
-xcept AttributeError
+lse
-                result += char
-        return result
-

core/db/typecasts.py

@@ -1 +1 @@
-import datetime
+from django.utils.tzinfo import FixedOffset
-
-###############################################
-# Converters from database (string) to Python #
@@ -25 +26 @@
-    # it away, but in the future we may make use of it.
-    if '-' in t:
-        t, tz = t.split('-', 1)
-'-' + tz
+- int(tz) * 60
-    elif '+' in t:
-        t, tz = t.split('+', 1)
-'+' + tz
+int(tz) * 60
-    else:
-''
+0
-    dates = d.split('-')
-    times = t.split(':')
-    seconds = times[2]
@@ -39 +40 @@
-    else:
-        microseconds = '0'
-    return datetime.datetime(int(dates[0]), int(dates[1]), int(dates[2]),
-
+
+
+
-
-def typecast_boolean(s):
-    if s is None: return None