Ticket #5712: views_debug_replace_invalid_chars.diff

django/views/debug.py

@@ -201 +206 @@
     if source is None:
         return None, [], None, []
 
-    encoding=None
+    encoding="ascii"
     for line in source[:2]:
         # File coding may be specified (and may not be UTF-8). Match
         # pattern from PEP-263 (http://www.python.org/dev/peps/pep-0263/)
@@ -209 +214 @@
         if match:
             encoding = match.group(1)
             break
-    if encoding:
-        source = [unicode(sline, encoding) for sline in source]
-
+    source = [unicode(sline, encoding, "replace") for sline in source]
+        
     lower_bound = max(0, lineno - context_lines)
     upper_bound = lineno + context_lines