Ticket #17937: timeuntil2.diff

django/utils/timesince.py

@@ -57 +57 @@
     Like timesince, but returns a string measuring the time until
     the given time.
     """
+    # Convert datetime.date to datetime.datetime for comparison.
+    if not isinstance(d, datetime.datetime):
+        d = datetime.datetime(d.year, d.month, d.day)
+
     if not now:
         now = datetime.datetime.now(utc if is_aware(d) else None)
     return timesince(now, d)

tests/regressiontests/utils/timesince.py

@@ -99 +99 @@
         self.assertEqual(timesince(now_tz), u'0 minutes')
         self.assertEqual(timeuntil(now_tz, now_tz_i), u'0 minutes')
 
+    def test_date_object(self):
+        """ Timesince and timeuntil should work with date objects (#17937 ) """
+        today = datetime.date.today()
+        self.assertEqual(timeuntil(today-self.oneday), u'0 minutes')
+        self.assertEqual(timesince(today+self.oneday), u'0 minutes')
+
     def test_both_date_objects(self):
         """ Timesince should work with both date objects (#9672) """
         today = datetime.date.today()