addressing #38: migrate the support for download file name in unicode. more test cases to come next

Author: chfw

django_excel/__init__.py

@@ -15,7 +15,7 @@
 from django.http import HttpResponse
 import pyexcel as pe
 import pyexcel_webio as webio
-from ._compact import DJANGO_ONE_SIX
+from ._compact import DJANGO_ONE_SIX, PY2_VERSION, urllib_quote
 
 
 class ExcelMixin(webio.ExcelInput):
@@ -124,8 +124,13 @@ def _make_response(content, content_type, status, file_name=None):
     """
     response = HttpResponse(content, content_type=content_type, status=status)
     if file_name:
+        if PY2_VERSION and isinstance(file_name, unicode):
+            file_name = file_name.encode('utf-8')
+        url_encoded_file_name = urllib_quote(file_name)
         response["Content-Disposition"] = (
-            "attachment; filename=%s" % (file_name))
+            "attachment; filename=%s;filename*=utf-8''%s"
+            % (url_encoded_file_name, url_encoded_file_name)
+        )
     return response
 
 

django_excel/_compact.py

@@ -1,6 +1,15 @@
 import pkg_resources
 from distutils.version import LooseVersion
 
+try:
+    # if in py2
+    from urllib import quote as urllib_quote
+    PY2_VERSION = True
+except ImportError:
+    # else (aka in py3)
+    from urllib.parse import quote as urllib_quote # flake8: noqa
+    PY2_VERSION = False
+
 
 django_version = pkg_resources.get_distribution('django').version
 

testResponse.py

@@ -9,6 +9,8 @@
 import pyexcel.ext.xls  # noqa
 import pyexcel.ext.xlsx  # noqa
 import pyexcel.ext.ods3  # noqa
+from django_excel._compact import urllib_quote
+
 PY2 = sys.version_info[0] == 2
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     from ordereddict import OrderedDict
@@ -68,9 +70,12 @@ def test_download_attachment(self):
             print(file_type)
             response = self.client.get(
                 "/polls/download_attachment/"+file_type+"/"+test_file_name)
+            url_encoded_file_name = urllib_quote(test_file_name)
             assert response['Content-Type'] == FILE_TYPE_MIME_TABLE[file_type]
             assert response['Content-Disposition'] == (
-                "attachment; filename=%s.%s" % (test_file_name, file_type))
+                "attachment; filename=%s.%s;filename*=utf-8''%s.%s"
+                % (url_encoded_file_name, file_type,
+                   url_encoded_file_name, file_type))
             sheet = pe.get_sheet(file_type=file_type,
                                  file_content=response.content)
             sheet.format(int)