Permalink
Browse files

[1.1.X] Fixed #11687: the `add` filter is now less failsome when face…

…d with things that can't be coerced to integers.

Backport of [12497] from trunk, although the fix here is slightly different to
avoid adding new behavior to a bugfix branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 8c4f166 commit bd79677e2999b545c27be8b2696c7f176ad78001 @jacobian jacobian committed Feb 22, 2010
Showing with 10 additions and 1 deletion.
  1. +4 −1 django/template/defaultfilters.py
  2. +6 −0 tests/regressiontests/templates/filters.py
View
5 django/template/defaultfilters.py
@@ -650,7 +650,10 @@ def _helper(list_, tabs=1):
def add(value, arg):
"""Adds the arg to the value."""
- return int(value) + int(arg)
+ try:
+ return int(value) + int(arg)
+ except (ValueError, TypeError):
+ return value
add.is_safe = False
def get_digit(value, arg):
View
6 tests/regressiontests/templates/filters.py
@@ -333,4 +333,10 @@ def get_filter_tests():
'date02': (r'{{ d|date }}', {'d': datetime(2008, 1, 1)}, 'Jan. 1, 2008'),
#Ticket 9520: Make sure |date doesn't blow up on non-dates
'date03': (r'{{ d|date:"m" }}', {'d': 'fail_string'}, ''),
+
+ # Ticket #11687: make sure that add works on int-able things.
+ 'add01': (r'{{ i|add:"5" }}', {'i': 2000}, '2005'),
+ 'add02': (r'{{ i|add:"napis" }}', {'i': 2000}, '2000'),
+ 'add03': (r'{{ i|add:16 }}', {'i': 'not_an_int'}, 'not_an_int'),
+ 'add04': (r'{{ i|add:"16" }}', {'i': 'not_an_int'}, 'not_an_int'),
}

0 comments on commit bd79677

Please sign in to comment.