Changeset 5862

Timestamp:

08/11/07 22:23:53 (1 year ago)

Author:

adrian

Message:

Fixed #5046 -- Added 'Unicode error hint' section to debug page in the case of a UnicodeError?. Thanks, Thomas Guttler

Files:

• django/trunk/django/views/debug.py (modified) (3 diffs)

django/trunk/django/views/debug.py

@@ -124 +124 @@
-            'lineno': '?',
-        }]
+
+    unicode_hint = ''
+    if issubclass(exc_type, UnicodeError):
+        start = getattr(exc_value, 'start', None)
+        end = getattr(exc_value, 'end', None)
+        if start is not None and end is not None:
+            unicode_str = exc_value.args[1]
+            unicode_hint = smart_unicode(unicode_str[max(start-5, 0):min(end+5, len(unicode_str))], 'ascii', errors='replace')
+
-    t = Template(TECHNICAL_500_TEMPLATE, name='Technical 500 template')
-    c = Context({
-        'exception_type': exc_type.__name__,
-        'exception_value': smart_unicode(exc_value, errors='replace'),
+        'unicode_hint': unicode_hint,
-        'frames': frames,
-        'lastframe': frames[-1],
@@ -259 +269 @@
-    #template, #template-not-exist { background:#f6f6f6; }
-    #template-not-exist ul { margin: 0 0 0 20px; }
+    #unicode-hint { background:#eee; }
-    #traceback { background:#eee; }
-    #requestinfo { background:#f6f6f6; padding-left:120px; }
@@ -359 +370 @@
-  </table>
-</div>
+{% if unicode_hint %}
+<div id="unicode-hint">
+    <h2>Unicode error hint</h2>
+    <p>The string that could not be encoded/decoded was: <strong>{{ unicode_hint|escape }}</strong></p>
+</div>
+{% endif %}
-{% if template_does_not_exist %}
-<div id="template-not-exist">