Changeset 8535

Timestamp:

08/25/08 07:31:10 (3 months ago)

Author:

russellm

Message:

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 <ashearerw@shearersoftware.com> for the report.

Files:

• django/trunk/django/template/defaultfilters.py (modified) (1 diff)
• django/trunk/docs/ref/templates/builtins.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/filters.py (modified) (2 diffs)

django/trunk/django/template/defaultfilters.py

@@ -644 +644 @@
-        return u''
-    if arg:
-arg, value
+value, arg
-    return timesince(value)
-timesince.is_safe = False

django/trunk/docs/ref/templates/builtins.txt

@@ -1331 +1331 @@
-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,
-comment_date|timesince:blog
+blog_date|timesince:comment
-
-Minutes is the smallest unit used, and "0 minutes" will be returned for any

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -374 +374 @@
-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'

django/trunk/tests/regressiontests/templates/filters.py

@@ -35 +35 @@
-
-        # Compare to a given parameter
-+ timedelta(days=2), 'b':now +
-+ timedelta(days=2, minutes=1), 'b':now +
+- timedelta(days=2), 'b':now -
+- timedelta(days=2, minutes=1), 'b':now -
-
-        # Check that timezone is respected
-
+
+
+
+
+
+
+
-
-        # Default compare with datetime.now()
@@ -49 +55 @@
-        '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": "<a>'", "b": mark_safe("<a>'")}, ur"<a>\' <a>\'"),