Skip to content

Fix ascii_filename to work properly in Python 3 #76

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
kwikwag wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ascii_filename to work properly in Python 3 #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions sendfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
__version__ = '.'.join(map(str, VERSION))

import os.path
import sys
from mimetypes import guess_type
import unicodedata

Expand Down Expand Up @@ -78,6 +79,9 @@ def sendfile(request, filename, attachment=False, attachment_filename=None, mime
from django.utils.encoding import force_unicode as force_text
attachment_filename = force_text(attachment_filename)
ascii_filename = unicodedata.normalize('NFKD', attachment_filename).encode('ascii','ignore')
if sys.version_info[0] >= 3:
# We want ascii_filename as a unicode string, since it will be formatted into parts
ascii_filename = ascii_filename.decode('ascii')
parts.append('filename="%s"' % ascii_filename)
if ascii_filename != attachment_filename:
from django.utils.http import urlquote
Expand Down