Ticket #5884: django_template_debug_handle_unicode_error.diff

django/template/__init__.py

@@ -128 +128 @@
         self.msg = msg
         self.params = params
 
-    def __str__(self):
-        return self.msg % self.params
+    def __unicode__(self):
+        return self.msg % tuple([force_unicode(p, errors='replace') for p in self.params])
 
 class InvalidTemplateLibrary(Exception):
     pass

django/template/debug.py

@@ -75 +75 @@
             raise
         except Exception, e:
             from sys import exc_info
-            wrapped = TemplateSyntaxError('Caught an exception while rendering: %s' % e)
+            wrapped = TemplateSyntaxError(u'Caught an exception while rendering: %s' % force_unicode(e, errors='replace'))
             wrapped.source = node.source
             wrapped.exc_info = exc_info()
             raise wrapped