Ticket #6353: 6353-2.diff

django/utils/encoding.py

@@ -49 +49 @@
-        if not isinstance(s, basestring,):
-            if hasattr(s, '__unicode__'):
-                s = unicode(s)
+            elif isinstance(s, Exception): 
+                try:
+                    s = unicode(s)
+                except UnicodeError:
+                    if errors == 'replace':
+                        s = ' '.join([force_unicode(arg, encoding, strings_only, errors) for arg in s.args])
+                    else:
+                        raise
-            else:
-                s = unicode(str(s), encoding, errors)
-        elif not isinstance(s, unicode):

django/views/debug.py

@@ -177 +177 @@
-        'root_urlconf': settings.ROOT_URLCONF,
-        'request_path': request.path[1:], # Trim leading slash
-        'urlpatterns': tried,
-tr(exception
+mart_unicode(exception, errors='replace'
-        'request': request,
-        'request_protocol': request.is_secure() and "https" or "http",
-        'settings': get_safe_settings(),