Ticket #5884: 5884.diff

django/template/__init__.py

@@ -125 +125 @@
 class VariableDoesNotExist(Exception):
 
     def __init__(self, msg, params=()):
-        self.msg = msg
-        self.params = params
+        self.msg = force_unicode(msg)
+        self.params = tuple([force_unicode(x) for x in params])
 
-    def __str__(self):
+    def __unicode__(self):
         return self.msg % self.params
 
 class InvalidTemplateLibrary(Exception):

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' % e)
             wrapped.source = node.source
             wrapped.exc_info = exc_info()
             raise wrapped