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

Don't fail for unicode filenames with send_file(add_etags=True)

Browse source
This commit is contained in:
Simon Sapin 2011-05-30 15:06:32 +02:00
parent e3f2dd8f08
commit 8017febac4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flask/helpers.py
View file

@ -379,7 +379,10 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
rv.set_etag('flask-%s-%s-%s' % ( rv.set_etag('flask-%s-%s-%s' % (
os.path.getmtime(filename), os.path.getmtime(filename),
os.path.getsize(filename), os.path.getsize(filename),
adler32(filename) & 0xffffffff adler32(
filename.encode('utf8') if isinstance(filename, unicode)
else filename
) & 0xffffffff
)) ))
if conditional: if conditional:
rv = rv.make_conditional(request) rv = rv.make_conditional(request)