Ticket #479: dateformat.patch

django/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 __repr__(self):
+        return self.__name
+
+    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 __init__(self, dt):
+        tzinfo.__init__(self, dt)
+        self._tzname = time.tzname[self._isdst(dt)]
+    def __repr__(self):
+        return self._tzname
+
+    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

django/utils/timesince.py

@@ -1 +1 @@
 import time, math, datetime
+from tzinfo import LocalTimezone
 
 def timesince(d, now=None):
     """
@@ -6 +7 @@
     as a nicely formatted string, e.g "10 minutes"
     Adapted from http://blog.natbat.co.uk/archive/2003/Jun/14/time_since
     """
-    original = time.mktime(d.timetuple())
     chunks = (
       (60 * 60 * 24 * 365, 'year'),
       (60 * 60 * 24 * 30, 'month'),
@@ -14 +14 @@
       (60 * 60, 'hour'),
       (60, 'minute')
     )
-    if not now:
-        now = time.time()
-    since = now - original
+    if now:
+        t = time.mktime(now)
+    else:
+        t = time.localtime()
+    if d.tzinfo:
+        tz = LocalTimezone()
+    else:
+        tz = None
+    now = datetime.datetime(t[0], t[1], t[2], t[3], t[4], t[5], tzinfo=tz)
+    delta = now - d
+    since = delta.days * 24 * 60 * 60 + delta.seconds
     # Crazy iteration syntax because we need i to be current index
     for i, (seconds, name) in zip(range(len(chunks)), chunks):
         count = math.floor(since / seconds)

django/utils/dateformat.py

@@ -13 +13 @@
 
 from calendar import isleap
 from dates import MONTHS, MONTHS_AP, WEEKDAYS
+from tzinfo import LocalTimezone
+import time
+import re
 
+re_formatchars = re.compile(r'(?<!\\)([aABdDfFgGhHiIjlLmMnNOPrsStTUwWyYzZ])')
+split_formatstr = re_formatchars.split
+re_escaped = re.compile(r'\\(.)')
+
 class DateFormat:
     year_days = [None, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
 
     def __init__(self, d):
         self.date = d
 
+        self.timezone = getattr(self.date, 'tzinfo', None)
+        if not self.timezone:
+            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."
-        raise NotImplementedError
+        if self.timezone.dst(self.date):
+            return '1'
+        else:
+            return '0'
 
     def j(self):
         "Day of the month without leading zeros; i.e. '1' to '31'"
@@ -116 +130 @@
 
     def O(self):
         "Difference to Greenwich time in hours; e.g. '+0200'"
-        raise NotImplementedError
+        tz = self.timezone.utcoffset(self.date)
+        return "%+03d%02d" % (tz.seconds / 3600, (tz.seconds / 60) % 60)
 
     def P(self):
         """
@@ -133 +148 @@
 
     def r(self):
         "RFC 822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
-        raise NotImplementedError
+        return self.format('D, j M Y H:i:s O')
 
     def s(self):
         "Seconds; i.e. '00' to '59'"
@@ -158 +173 @@
 
     def T(self):
         "Time zone of this machine; e.g. 'EST' or 'MDT'"
-        raise NotImplementedError
+        name = self.timezone.tzname(self.date)
+        if name is None:
+            name = self.format('O')
+        return name
 
     def U(self):
         "Seconds since the Unix epoch (January 1 1970 00:00:00 GMT)"
-        raise NotImplementedError
+        off = self.timezone.utcoffset(self.date)
+        return int(time.mktime(self.date.timetuple())) + off.seconds * 60
 
     def w(self):
         "Day of the week, numeric, i.e. '0' (Sunday) to '6' (Saturday)"
-        weekday = self.date.weekday()
-        if weekday == 0:
-            return 6
-        return weekday - 1
+        return (self.date.weekday() + 1) % 7
 
     def W(self):
         "ISO-8601 week number of year, weeks starting on Monday"
@@ -197 +213 @@
                     week_number -= 1
         return week_number
 
+    def y(self):
+        "Year, 2 digits; e.g. '99'"
+        return str(self.date.year)[2:]
+
     def Y(self):
         "Year, 4 digits; e.g. '1999'"
         return self.date.year
 
-    def y(self):
-        "Year, 2 digits; e.g. '99'"
-        return str(self.date.year)[2:]
-
     def z(self):
         "Day of the year; i.e. '0' to '365'"
         doy = self.year_days[self.date.month] + self.date.day
@@ -216 +232 @@
         """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."""
-        raise NotImplementedError
+        return self.timezone.utcoffset(self.date).seconds
 
     def format(self, formatstr):
-        result = ''
-        for char in formatstr:
-            try:
-                result += str(getattr(self, char)())
-            except AttributeError:
-                result += char
-        return result
+        pieces = []
+        for i, piece in enumerate(split_formatstr(formatstr)):
+            if i % 2:
+                pieces.append(str(getattr(self, piece)()))
+            elif piece:
+                pieces.append(re_escaped.sub(r'\1', piece))
+        return ''.join(pieces)
 
 class TimeFormat:
     def __init__(self, t):

tests/othertests/db_typecasts.py

@@ -1 +1 @@
 # Unit tests for django.core.db.typecasts
 
 from django.core.db import typecasts
+from django.utils.tzinfo import FixedOffset
 import datetime
 
 TEST_CASES = {

tests/othertests/dateformat.py

@@ +1 @@
+"""
+>>> format(my_birthday, '')
+''
+>>> format(my_birthday, 'a')
+'p.m.'
+>>> format(my_birthday, 'A')
+'PM'
+>>> format(my_birthday, 'j')
+'7'
+>>> format(my_birthday, 'l')
+'Saturday'
+>>> format(my_birthday, 'L')
+'False'
+>>> format(my_birthday, 'm')
+'07'
+>>> format(my_birthday, 'M')
+'Jul'
+>>> format(my_birthday, 'n')
+'7'
+>>> format(my_birthday, 'N')
+'July'
+>>> format(my_birthday, 'O')
+'+0100'
+>>> format(my_birthday, 'P')
+'10 p.m.'
+>>> format(my_birthday, 'r')
+'Sat, 7 Jul 1979 22:00:00 +0100'
+>>> format(my_birthday, 's')
+'00'
+>>> format(my_birthday, 'S')
+'th'
+>>> format(my_birthday, 't')
+Traceback (most recent call last):
+    ...
+NotImplementedError
+>>> format(my_birthday, 'T')
+'CET'
+>>> format(my_birthday, 'U')
+'300445200'
+>>> format(my_birthday, 'w')
+'6'
+>>> format(my_birthday, 'W')
+'27'
+>>> format(my_birthday, 'y')
+'79'
+>>> format(my_birthday, 'Y')
+'1979'
+>>> format(my_birthday, 'z')
+'188'
+>>> format(my_birthday, 'Z')
+'3600'
+
+>>> format(summertime, 'I')
+'1'
+>>> format(summertime, 'O')
+'+0200'
+>>> format(wintertime, 'I')
+'0'
+>>> format(wintertime, 'O')
+'+0100'
+
+>>> format(my_birthday, 'Y z \\C\\E\\T')
+'1979 188 CET'
+"""
+from django.utils.dateformat import format
+import datetime
+
+import os
+import time
+
+os.environ['TZ'] = 'Europe/Copenhagen'
+time.tzset()
+
+my_birthday = datetime.datetime(1979, 7, 7, 22, 00)
+summertime = datetime.datetime(2005, 10, 30, 1, 00)
+wintertime = datetime.datetime(2005, 10, 30, 4, 00)