Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #5712 -- Added more robustness to source code display in the de…

…bug view. Our behaviour is a bit more PEP 263 compliant now, too. Thanks, Thomas Güttler.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit fcbde3cbe5bcfcb88825f28629709b60035d9c9f 1 parent a1496b0
@malcolmt malcolmt authored
Showing with 4 additions and 5 deletions.
  1. +4 −5 django/views/debug.py
View
9 django/views/debug.py
@@ -201,16 +201,15 @@ def _get_lines_from_file(filename, lineno, context_lines, loader=None, module_na
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/)
+ # File coding may be specified. Match pattern from PEP-263
+ # (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]
+ source = [unicode(sline, encoding, 'replace') for sline in source]
lower_bound = max(0, lineno - context_lines)
upper_bound = lineno + context_lines
Please sign in to comment.
Something went wrong with that request. Please try again.