Ticket #1385: timesince.patch

django/utils/timesince.py

@@ -15 +15 @@
       (60 * 60, lambda n: ngettext('hour', 'hours', n)),
       (60, lambda n: ngettext('minute', 'minutes', n))
     )
+    # Convert datetime.date to datetime.datetime for comparison    
+    if d.__class__ is not datetime.datetime:
+        d = datetime.datetime(d.year, d.month, d.day)
     if now:
         t = now.timetuple()
     else:

tests/othertests/defaultfilters.py

@@ -237 +237 @@
 >>> timesince(datetime.datetime.now() - datetime.timedelta(1))
 '1 day'
 
+# datetime.date compataibility with timesince
+>>> timesince(datetime.date.today() - datetime.timedelta(1))
+'1 day, 23 hours'
+
 >>> default("val", "default")
 'val'