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

[soc2009/http-wsgi-improvements] Fix HttpResponseSendFile indentation issue and set its initial content to be an empty string, for compatibility with ticket refs #6527.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@11261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Chris Cahoon 2009-07-17 11:47:54 +00:00
parent a873df6f37
commit 3e5ab0b8ec
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
django/http/__init__.py
View File

@ -442,19 +442,18 @@ class HttpResponseSendFile(HttpResponse):
sendfile_fh = None sendfile_fh = None
def __init__(self, path_to_file, content_type=None, block_size=8192): def __init__(self, path_to_file, content_type=None, block_size=8192):
if not content_type: if not content_type:
from mimetypes import guess_type from mimetypes import guess_type
content_type = guess_type(path_to_file)[0] content_type = guess_type(path_to_file)[0]
if content_type is None: if content_type is None:
content_type = "application/octet-stream" content_type = "application/octet-stream"
super(HttpResponseSendFile, self).__init__(None, super(HttpResponseSendFile, self).__init__('', content_type=content_type)
content_type=content_type) self.sendfile_filename = path_to_file
self.sendfile_filename = path_to_file self.block_size = block_size
self.block_size = block_size self['Content-Length'] = os.path.getsize(path_to_file)
self['Content-Length'] = os.path.getsize(path_to_file) self['Content-Disposition'] = ('attachment; filename=%s' %
self['Content-Disposition'] = ('attachment; filename=%s' % os.path.basename(path_to_file))
os.path.basename(path_to_file)) self[settings.HTTPRESPONSE_SENDFILE_HEADER] = path_to_file
self[settings.HTTPRESPONSE_SENDFILE_HEADER] = path_to_file
def __iter__(self): def __iter__(self):
from django.core.servers.basehttp import FileWrapper from django.core.servers.basehttp import FileWrapper