p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #19210 -- Added leap year support to django.utils.timesince()

This commit is contained in:
Raphael Michel 2015-06-05 00:46:52 +02:00 committed by Tim Graham
parent 0207bdd2d4
commit 6700c90935
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/utils/timesince.py
View File

@ -1,5 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import calendar
import datetime import datetime
from django.utils.html import avoid_wrapping from django.utils.html import avoid_wrapping
@ -40,6 +41,10 @@ def timesince(d, now=None, reversed=False):
now = datetime.datetime.now(utc if is_aware(d) else None) now = datetime.datetime.now(utc if is_aware(d) else None)
delta = (d - now) if reversed else (now - d) delta = (d - now) if reversed else (now - d)
# Deal with leapyears by subtracing the number of leapdays
delta -= datetime.timedelta(calendar.leapdays(d.year, now.year))
# ignore microseconds # ignore microseconds
since = delta.days * 24 * 60 * 60 + delta.seconds since = delta.days * 24 * 60 * 60 + delta.seconds
if since <= 0: if since <= 0:

3
docs/releases/1.9.txt
View File

@ -297,6 +297,9 @@ Templates
the ability to register libraries and builtins explicitly through the the ability to register libraries and builtins explicitly through the
template :setting:`OPTIONS <TEMPLATES-OPTIONS>`. template :setting:`OPTIONS <TEMPLATES-OPTIONS>`.
* The ``timesince`` and ``timeuntil`` filters were improved to deal with leap
years when given large time spans.
Requests and Responses Requests and Responses
^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^

4
tests/utils_tests/test_timesince.py
View File

@ -131,3 +131,7 @@ class TimesinceTests(unittest.TestCase):
self.assertEqual(timesince(future), '0\xa0minutes') self.assertEqual(timesince(future), '0\xa0minutes')
past = datetime.datetime(1980, 1, 1, tzinfo=naive()) past = datetime.datetime(1980, 1, 1, tzinfo=naive())
self.assertEqual(timeuntil(past), '0\xa0minutes') self.assertEqual(timeuntil(past), '0\xa0minutes')
def test_thousand_years_ago(self):
t = datetime.datetime(1007, 8, 14, 13, 46, 0)
self.assertEqual(timesince(t, self.t), '1000\xa0years')