Django

Code

Changeset 8560

Show
Ignore:
Timestamp:
08/25/08 17:47:07 (3 months ago)
Author:
jacob
Message:

Fixed #6353: better handle unicode in exception reasons.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/views/debug.py

    r8420 r8560  
    88from django.utils.html import escape 
    99from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound 
    10 from django.utils.encoding import smart_unicode 
     10from django.utils.encoding import smart_unicode, smart_str 
    1111 
    1212HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST') 
    …… 
    257257        'request_path': request.path[1:], # Trim leading slash 
    258258        'urlpatterns': tried, 
    259         'reason': str(exception), 
     259        'reason': smart_str(exception, errors='replace'), 
    260260        'request': request, 
    261261        'request_protocol': request.is_secure() and "https" or "http",