mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

unicode: Fixed #4249 -- Decode source files correctly in the debug view.

Browse Source 
Thanks, Thomas Güttler.


git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-05-11 14:49:43 +00:00
parent 56db7a6078
commit 7225efba50
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -107,6 +107,7 @@ answer newbie questions, and generally made Django that much better:
Simon Greenhill <dev@simon.net.nz> Simon Greenhill <dev@simon.net.nz>
Owen Griffiths Owen Griffiths
Espen Grindhaug <http://grindhaug.org/> Espen Grindhaug <http://grindhaug.org/>
Thomas Güttler <hv@tbz-pariv.de>
Brian Harring <ferringb@gmail.com> Brian Harring <ferringb@gmail.com>
Brant Harris Brant Harris
Hawkeye Hawkeye

11
django/views/debug.py
View File

@ -188,6 +188,17 @@ def _get_lines_from_file(filename, lineno, context_lines, loader=None, module_na
if source is None: if source is None:
return None, [], None, [] return None, [], None, []
encoding=None
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/)
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) lower_bound = max(0, lineno - context_lines)
upper_bound = lineno + context_lines upper_bound = lineno + context_lines