p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #12649 - more helpful Unicode exceptions for CSRF migration helper script 

Thanks akaihola



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12266 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2010-01-20 12:54:19 +00:00
parent 5cd4c3e559
commit 1af45dc7bc
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extras/csrf_migration_helper.py
View File

@ -176,7 +176,12 @@ class Template(object):
return self._content
except AttributeError:
fd = open(self.absolute_filename)
content = fd.read().decode(TEMPLATE_ENCODING)
try:
content = fd.read().decode(TEMPLATE_ENCODING)
except UnicodeDecodeError, e:
message = '%s in %s' % (
e[4], self.absolute_filename.encode('UTF-8', 'ignore'))
raise UnicodeDecodeError(*(e.args[:4] + (message,)))
fd.close()
self._content = content
return content