Django

Code

Changeset 7260

Show
Ignore:
Timestamp:
03/17/08 09:21:09 (7 months ago)
Author:
mtredinnick
Message:

Fixed #5884 -- Added better display error handling for template variables.
Combined work from Karen Tracey and Thomas Güttler.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/template/debug.py

    r6969 r7260  
    7676        except Exception, e: 
    7777            from sys import exc_info 
    78             wrapped = TemplateSyntaxError('Caught an exception while rendering: %s' % e
     78            wrapped = TemplateSyntaxError(u'Caught an exception while rendering: %s' % force_unicode(e, errors='replace')
    7979            wrapped.source = node.source 
    8080            wrapped.exc_info = exc_info() 
  • django/trunk/django/template/__init__.py

    r7089 r7260  
    130130 
    131131    def __str__(self): 
    132         return self.msg % self.params 
     132        return unicode(self).encode('utf-8') 
     133 
     134    def __unicode__(self): 
     135        return self.msg % tuple([force_unicode(p, errors='replace') for p in self.params]) 
    133136 
    134137class InvalidTemplateLibrary(Exception):