Ticket #17419: json-filter.v4.diff

django/template/defaultfilters.py

@@ -848 +848 @@
     Thus, when using this filter between <script> tags for such a document,
     you'll want to avoid escaping the output: {{ data|json|safe }}
     """
-    return simplejson.dumps(value)
+    try:
+        return simplejson.dumps(value)
+    except TypeError:
+        return ''
 
 @register.filter(is_safe=False)
 def pluralize(value, arg=u's'):

docs/ref/templates/builtins.txt

@@ -1693 +1693 @@
         var json_data = {{ value|json|safe }};
     </script>
 
-Remember that JSON marked as safe will contain unescaped strings and those need
-to be properly handled in the receiver.
+.. note::
+
+    Remember that JSON marked as safe will contain unescaped strings and those need
+    to be properly handled in the receiver.
 
 .. templatefilter:: last
 

tests/regressiontests/templates/filters.py

@@ -108 +108 @@
 
         # json filter #17419
         'filter-json01': ("{{ data|json }}", {"data": {"hello": ["world", "universe"]}}, u'{"hello": ["world", "universe"]}'),
-        'filter-json02': ("{{ data|json|safe }}", {"data": {"foo": "<bar>"}}, u'{"foo": "<bar>"}'),
-        'filter-json03': ("{{ data|json|safe }}", {"data": ["foo", 'ba"r']}, u'["foo", "ba\\"r"]'),
+        'filter-json02': ("{{ data|json }}", {"data": object()}, u''),
+        'filter-json03': ("{{ data|json|safe }}", {"data": {"foo": "<bar>"}}, u'{"foo": "<bar>"}'),
+        'filter-json04': ("{{ data|json|safe }}", {"data": ["foo", 'ba"r']}, u'["foo", "ba\\"r"]'),
 
         # The make_list filter can destroy existing escaping, so the results are
         # escaped.