Skip to content

mimetype fix for Django1.7 and Stream #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SkiBY wants to merge 2 commits into
base: master
Choose a base branch
from
Open

mimetype fix for Django1.7 and Stream #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c114ac
Update shortcuts.py
Jan 29, 2014
01902d6
Update shortcuts.py
Sep 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion webodt/shortcuts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
from webodt.converters import converter
from webodt.helpers import get_mimetype

from django import get_version
if get_version()[0] >= 1 and get_version()[2] > 5:
from django.http import StreamingHttpResponse as HttpResponse



import webodt

def render_to(format, template_name,
Expand Down Expand Up @@ -78,7 +84,7 @@ def render_to_response(template_name,
content = _ifile(content_fd)
else:
content = content_fd.read()
response = HttpResponse(content, mimetype=mimetype)
response = HttpResponse(content, content_type=mimetype)
if not filename:
filename = os.path.basename(template_name)
filename += '.%s' % format
Expand Down