p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #17937 -- Avoided an error in the timeuntil filter when it receives a date object. Thanks Dmitry Guyvoronsky for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin 2012-03-22 07:29:39 +00:00
parent 4219e2b7f8
commit 1e28567e0d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/utils/timesince.py
View File

@ -3,7 +3,7 @@ import datetime
from django.utils.timezone import is_aware, utc
from django.utils.translation import ungettext, ugettext
def timesince(d, now=None):
def timesince(d, now=None, reversed=False):
"""
Takes two datetime objects and returns the time between d and now
as a nicely formatted string, e.g. "10 minutes". If d occurs after now,
@ -33,7 +33,7 @@ def timesince(d, now=None):
if not now:
now = datetime.datetime.now(utc if is_aware(d) else None)
delta = now - d
delta = (d - now) if reversed else (now - d)
# ignore microseconds
since = delta.days * 24 * 60 * 60 + delta.seconds
if since <= 0:
@ -57,6 +57,4 @@ def timeuntil(d, now=None):
Like timesince, but returns a string measuring the time until
the given time.
"""
if not now:
now = datetime.datetime.now(utc if is_aware(d) else None)
return timesince(now, d)
return timesince(d, now, reversed=True)

12
tests/regressiontests/utils/timesince.py
View File

@ -99,12 +99,18 @@ class TimesinceTests(unittest.TestCase):
self.assertEqual(timesince(now_tz), u'0 minutes')
self.assertEqual(timeuntil(now_tz, now_tz_i), u'0 minutes')
def test_date_objects(self):
""" Both timesince and timeuntil should work on date objects (#17937). """
today = datetime.date.today()
self.assertEqual(timesince(today + self.oneday), u'0 minutes')
self.assertEqual(timeuntil(today - self.oneday), u'0 minutes')
def test_both_date_objects(self):
""" Timesince should work with both date objects (#9672) """
today = datetime.date.today()
self.assertEqual(timeuntil(today+self.oneday, today), u'1 day')
self.assertEqual(timeuntil(today-self.oneday, today), u'0 minutes')
self.assertEqual(timeuntil(today+self.oneweek, today), u'1 week')
self.assertEqual(timeuntil(today + self.oneday, today), u'1 day')
self.assertEqual(timeuntil(today - self.oneday, today), u'0 minutes')
self.assertEqual(timeuntil(today + self.oneweek, today), u'1 week')
def test_naive_datetime_with_tzinfo_attribute(self):
class naive(datetime.tzinfo):