orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #237 from SimonSapin/master

Browse source 
A fix for send_file with unicode filenames.
This commit is contained in:
Armin Ronacher 2011-06-24 07:30:56 -07:00
commit 46ecc57b7c
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)