timeuntil filters doesn't work with DateField since [8579]

[anonymous]

Timeuntil filter doesn't work anymore since changset [8579] when using DateField:

>>> import datetime
>>> from django.template.defaultfilters import timeuntil,timesince
>>> timeuntil(datetime.datetime.now() + datetime.timedelta(1))
u'1 day'
>>> timesince(datetime.datetime.now()- datetime.timedelta(1))
u'1 day'
>>> timeuntil(datetime.date.today() + datetime.timedelta(1))
u''
>>> timesince(datetime.date.today() - datetime.timedelta(1))
u'1 day, 23 hours' 

With patch applied :

>>> import datetime
>>> from django.template.defaultfilters import timeuntil,timesince
>>> timeuntil(datetime.datetime.now() + datetime.timedelta(1))
u'1 day'
>>> timesince(datetime.datetime.now()- datetime.timedelta(1))
u'1 day'
>>> timeuntil(datetime.date.today() + datetime.timedelta(1))
u'33 minutes'
>>> timesince(datetime.date.today() - datetime.timedelta(1)) 
u'1 day, 23 hours'

timeuntil function should also convert input to datetime.datetime instance.

[Ross Poulton]

Moved fix into timesince block so any use of timesince() will apply it, and added unit tests. Against Django r9739.

[Ross Poulton]

In my attachment I have moved the anonymous fix into the timesince block rather than timeuntil, so that any use of timesince from other places (eg direct usage in a view) will also pick up the same change. It also has the impact of causing timesince with a now input of type date (rather than datetime) to work correctly.

I've also added some unit tests to the patch, hopefully they are sufficient for checkin.

[mcroydon]

This patch still applies cleanly. New tests fail before fix is applied and pass afterward. This should be ready for checkin.

[mcroydon]

Looking at this a little closer.

[Jacob]

This actually appears to have been fixed in [10215].

[Jacob]

(In [10440]) Added some tests to show that #9672 has been fixed ever since [10215]. Refs #9672.

[Jacob]

(In [10441]) [1.0.X] Added some tests to show that #9672 has been fixed ever since [10215]. Refs #9672. Backport of r10440 from trunk.

[Jacob]

Milestone 1.1 deleted