Commit 67402a6f authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Reverted [8481] and [8482] while we work out what is going on with #8453 and... 

Reverted [8481] and [8482] while we work out what is going on with #8453 and the related discussions that I wasn't previously aware of.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 358ba071

django/template/defaultfilters.py

+1 −1
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ def timesince(value, arg=None): 
    if not value:

        return u''

    if arg:

        return timesince(value, arg)

        return timesince(arg, value)

    return timesince(value)

timesince.is_safe = False

tests/regressiontests/defaultfilters/tests.py

+0 −9
Original line number Diff line number Diff line
@@ -373,15 +373,6 @@ 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'

tests/regressiontests/templates/filters.py

+3 −16
Original line number Diff line number Diff line
@@ -34,17 +34,11 @@ 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'),



        # 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'),

        'filter-timesince06' : ('{{ a|timesince:b }}', {'a':now_tz + timedelta(hours=8), 'b':now_tz}, '8 hours'),



        # Default compare with datetime.now()

        'filter-timeuntil01' : ('{{ a|timeuntil }}', {'a':datetime.now() + timedelta(minutes=2, seconds = 10)}, '2 minutes'),
@@ -55,13 +49,6 @@ 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": "<a>'", "b": mark_safe("<a>'")}, ur"<a>\' <a>\'"),

        'filter-addslash02': ("{{ a|addslashes }} {{ b|addslashes }}", {"a": "<a>'", "b": mark_safe("<a>'")}, ur"&lt;a&gt;\&#39; <a>\'"),