Ticket #9672: timeuntil.date.diff

django/utils/timesince.py

@@ -34 +34 @@
             now = datetime.datetime.now(LocalTimezone(d))
         else:
             now = datetime.datetime.now()
+
+    # Convert datetime.date to datetime.datetime for comparison
+    if now.__class__ is not datetime.datetime:
+        now = datetime.datetime(now.year, now.month, now.day)
 
     # ignore microsecond part of 'd' since we removed it from 'now'
     delta = now - (d - datetime.timedelta(0, 0, d.microsecond))
@@ -64 +68 @@
             now = datetime.datetime.now(LocalTimezone(d))
         else:
             now = datetime.datetime.now()
+
     return timesince(now, d)

tests/regressiontests/utils/timesince.py

@@ -1 +1 @@
 """
->>> from datetime import datetime, timedelta
+>>> from datetime import datetime, timedelta, date
 >>> from django.utils.timesince import timesince, timeuntil
 >>> from django.utils.tzinfo import LocalTimezone, FixedOffset
 
@@ -86 +86 @@
 u'0 minutes'
 >>> timeuntil(now_tz, now_tz_i)
 u'0 minutes'
+
+# Timeuntil should work with both date and datetime objects
+>>> today = date.today()
+>>> timeuntil(today+oneday, today)
+u'1 day'
+>>> timeuntil(today-oneday, today)
+u'0 minutes'
+>>> timeuntil(today+oneweek, today)
+u'1 week'
 """