Ticket #4249: views_debug_py.diff

django/branches/unicode/django/views/debug.py

@@ -188 +188 @@
     if source is None:
         return None, [], None, []
 
+    encoding=None
+    for line in source[0:min(len(source), 2)]:
+        # Convert lines to unicode.
+        # See: http://www.python.org/dev/peps/pep-0263/
+        match = re.search(r'coding[:=]\s*([-\w.]+)', line)
+        if match:
+            encoding = match.group(1)
+            break
+    if encoding:
+        source = [unicode(sline, encoding) for sline in source]
+        
     lower_bound = max(0, lineno - context_lines)
     upper_bound = lineno + context_lines