maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #2019 from pallets/bugfix/sendfile-error

Browse source 
Do not cause errors for unknown files for sendfile
This commit is contained in:
Armin Ronacher 2016-09-12 21:52:42 +03:00 • committed by GitHub
commit a40489e0ce
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flask/helpers.py
View file

@ -513,14 +513,10 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
if mimetype is None:
if attachment_filename is not None:
mimetype = mimetypes.guess_type(attachment_filename)[0]
mimetype = mimetypes.guess_type(attachment_filename)[0] \
or 'application/octet-stream'
if mimetype is None:
if attachment_filename is not None:
raise ValueError(
'Unable to infer MIME-type from filename {0!r}, please '
'pass one explicitly.'.format(attachment_filename)
)
raise ValueError(
'Unable to infer MIME-type because no filename is available. '
'Please set either `attachment_filename`, pass a filepath to '