Ticket #7443: 7443-r8486.diff

File 7443-r8486.diff, 4.1 KB (added by russellm, 7 years ago)

Patch applied as [8481] but then reverted.

  • django/template/defaultfilters.py

     
    643643    if not value:
    644644        return u''
    645645    if arg:
    646         return timesince(arg, value)
     646        return timesince(value, arg)
    647647    return timesince(value)
    648648timesince.is_safe = False
    649649
  • tests/regressiontests/defaultfilters/tests.py

     
    373373>>> timesince(datetime.datetime.now() - datetime.timedelta(1))
    374374u'1 day'
    375375
     376>>> timesince(datetime.datetime(2005, 12, 29), datetime.datetime(2005, 12, 30))
     377u'1 day'
     378
     379>>> timeuntil(datetime.datetime.now() + datetime.timedelta(1))
     380u'1 day'
     381
     382>>> timeuntil(datetime.datetime(2005, 12, 30), datetime.datetime(2005, 12, 29))
     383u'1 day'
     384
    376385>>> default(u"val", u"default")
    377386u'val'
    378387
  • tests/regressiontests/templates/filters.py

     
    3434        'filter-timesince03' : ('{{ a|timesince }}', {'a': datetime.now() - timedelta(hours=1, minutes=25, seconds = 10)}, '1 hour, 25 minutes'),
    3535
    3636        # Compare to a given parameter
    37         'filter-timesince04' : ('{{ a|timesince:b }}', {'a':now + timedelta(days=2), 'b':now + timedelta(days=1)}, '1 day'),
    38         'filter-timesince05' : ('{{ a|timesince:b }}', {'a':now + timedelta(days=2, minutes=1), 'b':now + timedelta(days=2)}, '1 minute'),
     37        'filter-timesince04' : ('{{ a|timesince:b }}', {'a':now - timedelta(days=2), 'b':now - timedelta(days=1)}, '1 day'),
     38        'filter-timesince05' : ('{{ a|timesince:b }}', {'a':now - timedelta(days=2, minutes=1), 'b':now - timedelta(days=2)}, '1 minute'),
    3939
    4040        # Check that timezone is respected
    41         'filter-timesince06' : ('{{ a|timesince:b }}', {'a':now_tz + timedelta(hours=8), 'b':now_tz}, '8 hours'),
     41        'filter-timesince06' : ('{{ a|timesince:b }}', {'a':now_tz - timedelta(hours=8), 'b':now_tz}, '8 hours'),
    4242
     43        # Regression for #7443
     44        'filter-timesince07': ('{{ earlier|timesince }}', { 'earlier': now - timedelta(days=7) }, '1 week'),
     45        'filter-timesince08': ('{{ earlier|timesince:now }}', { 'now': now, 'earlier': now - timedelta(days=7) }, '1 week'),
     46        'filter-timesince09': ('{{ later|timesince }}', { 'later': now + timedelta(days=7) }, '0 minutes'),
     47        'filter-timesince10': ('{{ later|timesince:now }}', { 'now': now, 'later': now + timedelta(days=7) }, '0 minutes'),
     48
    4349        # Default compare with datetime.now()
    4450        'filter-timeuntil01' : ('{{ a|timeuntil }}', {'a':datetime.now() + timedelta(minutes=2, seconds = 10)}, '2 minutes'),
    4551        'filter-timeuntil02' : ('{{ a|timeuntil }}', {'a':(datetime.now() + timedelta(days=1, seconds = 10))}, '1 day'),
     
    4955        'filter-timeuntil04' : ('{{ a|timeuntil:b }}', {'a':now - timedelta(days=1), 'b':now - timedelta(days=2)}, '1 day'),
    5056        'filter-timeuntil05' : ('{{ a|timeuntil:b }}', {'a':now - timedelta(days=2), 'b':now - timedelta(days=2, minutes=1)}, '1 minute'),
    5157
     58        # Regression for #7443
     59        'filter-timeuntil06': ('{{ earlier|timeuntil }}', { 'earlier': now - timedelta(days=7) }, '0 minutes'),
     60        'filter-timeuntil07': ('{{ earlier|timeuntil:now }}', { 'now': now, 'earlier': now - timedelta(days=7) }, '0 minutes'),
     61        'filter-timeuntil08': ('{{ later|timeuntil }}', { 'later': now + timedelta(days=7) }, '1 week'),
     62        'filter-timeuntil09': ('{{ later|timeuntil:now }}', { 'now': now, 'later': now + timedelta(days=7) }, '1 week'),
     63
     64
    5265        'filter-addslash01': ("{% autoescape off %}{{ a|addslashes }} {{ b|addslashes }}{% endautoescape %}", {"a": "<a>'", "b": mark_safe("<a>'")}, ur"<a>\' <a>\'"),
    5366        'filter-addslash02': ("{{ a|addslashes }} {{ b|addslashes }}", {"a": "<a>'", "b": mark_safe("<a>'")}, ur"&lt;a&gt;\&#39; <a>\'"),
    5467
Back to Top