From 06d49768bd6974a455e6dd46e9526a093721897e Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 25 Aug 2008 12:31:10 +0000 Subject: [PATCH] Fixed #7743: Reverted [8483], which was itself a reversion of [8481], after confirmation from Malcolm. Corrected a long standing mistake in the timesince/timeuntil filters when using a parameter for 'now'. Thanks to Andrew Shearer for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8535 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/defaultfilters.py | 2 +- docs/ref/templates/builtins.txt | 2 +- tests/regressiontests/defaultfilters/tests.py | 9 +++++++++ tests/regressiontests/templates/filters.py | 19 ++++++++++++++++--- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index cef314387a..1140f7ee40 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -643,7 +643,7 @@ def timesince(value, arg=None): if not value: return u'' if arg: - return timesince(arg, value) + return timesince(value, arg) return timesince(value) timesince.is_safe = False diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index feca435ffe..20c5ee513e 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1330,7 +1330,7 @@ Takes an optional argument that is a variable containing the date to use as the comparison point (without the argument, the comparison point is *now*). For example, if ``blog_date`` is a date instance representing midnight on 1 June 2006, and ``comment_date`` is a date instance for 08:00 on 1 June 2006, -then ``{{ comment_date|timesince:blog_date }}`` would return "8 hours". +then ``{{ blog_date|timesince:comment_date }}`` would return "8 hours". Minutes is the smallest unit used, and "0 minutes" will be returned for any date that is in the future relative to the comparison point. diff --git a/tests/regressiontests/defaultfilters/tests.py b/tests/regressiontests/defaultfilters/tests.py index 1b659a91f4..42e9bcaeb3 100644 --- a/tests/regressiontests/defaultfilters/tests.py +++ b/tests/regressiontests/defaultfilters/tests.py @@ -373,6 +373,15 @@ u'12' >>> timesince(datetime.datetime.now() - datetime.timedelta(1)) u'1 day' +>>> timesince(datetime.datetime(2005, 12, 29), datetime.datetime(2005, 12, 30)) +u'1 day' + +>>> timeuntil(datetime.datetime.now() + datetime.timedelta(1)) +u'1 day' + +>>> timeuntil(datetime.datetime(2005, 12, 30), datetime.datetime(2005, 12, 29)) +u'1 day' + >>> default(u"val", u"default") u'val' diff --git a/tests/regressiontests/templates/filters.py b/tests/regressiontests/templates/filters.py index c780a64baf..5dbb8e7e23 100644 --- a/tests/regressiontests/templates/filters.py +++ b/tests/regressiontests/templates/filters.py @@ -34,11 +34,17 @@ def get_filter_tests(): 'filter-timesince03' : ('{{ a|timesince }}', {'a': datetime.now() - timedelta(hours=1, minutes=25, seconds = 10)}, '1 hour, 25 minutes'), # Compare to a given parameter - 'filter-timesince04' : ('{{ a|timesince:b }}', {'a':now + timedelta(days=2), 'b':now + timedelta(days=1)}, '1 day'), - 'filter-timesince05' : ('{{ a|timesince:b }}', {'a':now + timedelta(days=2, minutes=1), 'b':now + timedelta(days=2)}, '1 minute'), + 'filter-timesince04' : ('{{ a|timesince:b }}', {'a':now - timedelta(days=2), 'b':now - timedelta(days=1)}, '1 day'), + 'filter-timesince05' : ('{{ a|timesince:b }}', {'a':now - timedelta(days=2, minutes=1), 'b':now - timedelta(days=2)}, '1 minute'), # Check that timezone is respected - 'filter-timesince06' : ('{{ a|timesince:b }}', {'a':now_tz + timedelta(hours=8), 'b':now_tz}, '8 hours'), + 'filter-timesince06' : ('{{ a|timesince:b }}', {'a':now_tz - timedelta(hours=8), 'b':now_tz}, '8 hours'), + + # Regression for #7443 + 'filter-timesince07': ('{{ earlier|timesince }}', { 'earlier': now - timedelta(days=7) }, '1 week'), + 'filter-timesince08': ('{{ earlier|timesince:now }}', { 'now': now, 'earlier': now - timedelta(days=7) }, '1 week'), + 'filter-timesince09': ('{{ later|timesince }}', { 'later': now + timedelta(days=7) }, '0 minutes'), + 'filter-timesince10': ('{{ later|timesince:now }}', { 'now': now, 'later': now + timedelta(days=7) }, '0 minutes'), # Default compare with datetime.now() 'filter-timeuntil01' : ('{{ a|timeuntil }}', {'a':datetime.now() + timedelta(minutes=2, seconds = 10)}, '2 minutes'), @@ -49,6 +55,13 @@ def get_filter_tests(): 'filter-timeuntil04' : ('{{ a|timeuntil:b }}', {'a':now - timedelta(days=1), 'b':now - timedelta(days=2)}, '1 day'), 'filter-timeuntil05' : ('{{ a|timeuntil:b }}', {'a':now - timedelta(days=2), 'b':now - timedelta(days=2, minutes=1)}, '1 minute'), + # Regression for #7443 + 'filter-timeuntil06': ('{{ earlier|timeuntil }}', { 'earlier': now - timedelta(days=7) }, '0 minutes'), + 'filter-timeuntil07': ('{{ earlier|timeuntil:now }}', { 'now': now, 'earlier': now - timedelta(days=7) }, '0 minutes'), + 'filter-timeuntil08': ('{{ later|timeuntil }}', { 'later': now + timedelta(days=7) }, '1 week'), + 'filter-timeuntil09': ('{{ later|timeuntil:now }}', { 'now': now, 'later': now + timedelta(days=7) }, '1 week'), + + 'filter-addslash01': ("{% autoescape off %}{{ a|addslashes }} {{ b|addslashes }}{% endautoescape %}", {"a": "'", "b": mark_safe("'")}, ur"\' \'"), 'filter-addslash02': ("{{ a|addslashes }} {{ b|addslashes }}", {"a": "'", "b": mark_safe("'")}, ur"<a>\' \'"),