Ticket #4367: debug_py.diff

django/views/debug.py

@@ -420 +420 @@
                 {% for var in frame.vars|dictsort:"0" %}
                   <tr>
                     <td>{{ var.0 }}</td>
-                    <td class="code"><div>{{ var.1|pprint|escape }}</div></td>
+                    <td class="code"><div>{{ var.1|pprint|escape|smart_unicode_replace }}</div></td>
                   </tr>
                 {% endfor %}
               </tbody>

django/template/defaultfilters.py

@@ -3 +3 @@
 from django.template import resolve_variable, Library
 from django.conf import settings
 from django.utils.translation import ugettext, ungettext
-from django.utils.encoding import force_unicode, smart_str, iri_to_uri
+from django.utils.encoding import force_unicode, smart_str, iri_to_uri, smart_unicode
 import re
 import random as random_module
 
@@ -554 +554 @@
     except Exception, e:
         return u"Error in formatting:%s" % force_unicode(e)
 
+def smart_unicode_replace(value):
+    return smart_unicode(value, errors='replace')
+
 # Syntax: register.filter(name of filter, callback)
 register.filter(add)
 register.filter(addslashes)
@@ -606 +609 @@
 register.filter(wordcount)
 register.filter(wordwrap)
 register.filter(yesno)
+register.filter(smart_unicode_replace)