innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.5.x] Fixed #19397 -- Crash on binary files in project templates. 

Thanks gw 2012 at tnode com for the report.

Backport of baae4b8.
This commit is contained in:
Aymeric Augustin 2012-12-03 10:37:26 +01:00
parent 1b93499849
commit c9a47fb379
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/core/management/templates.py
View File

@ -8,8 +8,6 @@ import shutil
import stat import stat
import sys import sys
import tempfile import tempfile
import codecs
try: try:
from urllib.request import urlretrieve from urllib.request import urlretrieve
except ImportError: # Python 2 except ImportError: # Python 2
@ -156,12 +154,14 @@ class TemplateCommand(BaseCommand):
# Only render the Python files, as we don't want to # Only render the Python files, as we don't want to
# accidentally render Django templates files # accidentally render Django templates files
with codecs.open(old_path, 'r', 'utf-8') as template_file: with open(old_path, 'rb') as template_file:
content = template_file.read() content = template_file.read()
if filename.endswith(extensions) or filename in extra_files: if filename.endswith(extensions) or filename in extra_files:
content = content.decode('utf-8')
template = Template(content) template = Template(content)
content = template.render(context) content = template.render(context)
with codecs.open(new_path, 'w', 'utf-8') as new_file: content = content.encode('utf-8')
with open(new_path, 'wb') as new_file:
new_file.write(content) new_file.write(content)
if self.verbosity >= 2: if self.verbosity >= 2:

BIN
tests/regressiontests/admin_scripts/custom_templates/project_template/ticket-19397-binary-file.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 894 B